Merge tag 'upstream/0.10.5'
authorMati Aharoni (Kali Linux Developer) <muts@kali.org>
Sun, 24 Mar 2013 09:49:23 +0000 (05:49 -0400)
committerMati Aharoni (Kali Linux Developer) <muts@kali.org>
Sun, 24 Mar 2013 09:49:23 +0000 (05:49 -0400)
Upstream version 0.10.5


Trivial merge