Merge tag 'upstream/2.0-beta3+git20140220'
authorDevon Kearns <dookie@kali.org>
Thu, 20 Feb 2014 17:41:28 +0000 (10:41 -0700)
committerDevon Kearns <dookie@kali.org>
Thu, 20 Feb 2014 17:41:28 +0000 (10:41 -0700)
commit9bfbbd13840ca1634c687784760b0b3298999440
tree72a0cd3ea2a4ca5e5bf9ae6f14aa09ce44790ea7
parent33190b8e8f5c12182e12d9ca84246ce630ab0826
parent30372c2b8e3249e07faaa37801474ddca6be7b13
Merge tag 'upstream/2.0-beta3+git20140220'

Upstream version 2.0-beta3+git20140220