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)
Upstream version 2.0-beta2+git20131205


Trivial merge