Merge tag 'upstream/2.0beta'
authorJim O'Gorman (Kali Developer) <elwood@offensive-security.com>
Tue, 6 Jan 2015 22:49:44 +0000 (17:49 -0500)
committerJim O'Gorman (Kali Developer) <elwood@offensive-security.com>
Tue, 6 Jan 2015 22:49:44 +0000 (17:49 -0500)
commit6bccce79e409dce1dcd545b565ae7c4613255450
tree09321626763ee15d149422ab97f47c7ea31acc13
parentd2980b1bb629c56d736cd8da1708cdc1ebca9ead
parente0372fd19f4513d85054f39991b027e44f17eb2c
Merge tag 'upstream/2.0beta'

Upstream version 2.0beta