Merge tag 'upstream/0.10.6'
authorMati Aharoni (Kali Linux Developer) <muts@kali.org>
Mon, 19 Aug 2013 14:17:54 +0000 (10:17 -0400)
committerMati Aharoni (Kali Linux Developer) <muts@kali.org>
Mon, 19 Aug 2013 14:17:54 +0000 (10:17 -0400)
commit3f4682b880cc7e8d5098cd0ec575372af797122f
tree9113bf70d2f9852e67d5ca6d714f2f12bbafad12
parenta25d895a006b9b471c9451c19ac28a01f819f1a6
parent429af1850068e0edb8d13115de0ad4ab253029ac
Merge tag 'upstream/0.10.6'

Upstream version 0.10.6