Merge tag 'upstream/0.10'
authorDevon Kearns <dookie@kali.org>
Wed, 29 Oct 2014 00:51:42 +0000 (18:51 -0600)
committerDevon Kearns <dookie@kali.org>
Wed, 29 Oct 2014 00:51:42 +0000 (18:51 -0600)
Upstream version 0.10


Trivial merge