Merge tag 'upstream/2.0-beta2+git20131205'
authorDevon Kearns <dookie@kali.org>
Thu, 5 Dec 2013 21:50:59 +0000 (14:50 -0700)
committerDevon Kearns <dookie@kali.org>
Thu, 5 Dec 2013 21:50:59 +0000 (14:50 -0700)
commit33190b8e8f5c12182e12d9ca84246ce630ab0826
treea59ecc45e80a32e5bd76751ceee50848055740f2
parent4a19482390125711d41852f5c262f2339e95d57d
parent7bb6dee4a78c5461c6a0285918f025547af6100a
Merge tag 'upstream/2.0-beta2+git20131205'

Upstream version 2.0-beta2+git20131205