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)
Upstream version 2.0beta


Trivial merge