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)
commitd68084d5c5fa68b64baaa1206f85fa2f4dc35ecf
tree2b3a93d616fa09862161176697495ae641ddf73a
parent7e901a5a3820645b64fca266260292f4f18eea81
parent8074614a346a9ef8f1004de78782ae3e4fe8fa03
Merge tag 'upstream/0.10'

Upstream version 0.10