Merge tag 'upstream/1.2.2-1'
authorDevon Kearns <dookie@kali.org>
Wed, 4 Dec 2013 20:34:02 +0000 (13:34 -0700)
committerDevon Kearns <dookie@kali.org>
Wed, 4 Dec 2013 20:34:02 +0000 (13:34 -0700)
Upstream version 1.2.2-1


Trivial merge