Merge tag 'upstream/0.10.6'
authorMati Aharoni (Kali Linux Developer) <muts@kali.org>
Mon, 19 Aug 2013 14:36:37 +0000 (10:36 -0400)
committerMati Aharoni (Kali Linux Developer) <muts@kali.org>
Mon, 19 Aug 2013 14:36:37 +0000 (10:36 -0400)
commit0c15f94a80481a35f4994f497aa61cbed3f2d0d8
tree9113bf70d2f9852e67d5ca6d714f2f12bbafad12
parent3f4682b880cc7e8d5098cd0ec575372af797122f
parentb374e6296ce1e83b6046693b934534604b519bbb
Merge tag 'upstream/0.10.6'

Upstream version 0.10.6