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)
commitab7e5471767e6cede9c40e3282a93d92d2714914
tree84736961184b4c857316169b975c097a3f1bfad4
parent80110c3d97a8693b4279667f40756cf6d7ac465f
parent20c7e28c9eea00add8ebd0f77704fd798787050e
Merge tag 'upstream/1.2.2-1'

Upstream version 1.2.2-1