Merge tag 'upstream/0.3.8'
authorMati Aharoni (Kali Linux Developer) <muts@kali.org>
Mon, 19 Aug 2013 15:39:32 +0000 (11:39 -0400)
committerMati Aharoni (Kali Linux Developer) <muts@kali.org>
Mon, 19 Aug 2013 15:39:32 +0000 (11:39 -0400)
Upstream version 0.3.8


Trivial merge