Merge tag 'upstream/1.2.1'
authorDevon Kearns <dookie@kali.org>
Wed, 3 Jul 2013 16:28:20 +0000 (10:28 -0600)
committerDevon Kearns <dookie@kali.org>
Wed, 3 Jul 2013 16:28:20 +0000 (10:28 -0600)
commit4c136d1a31fe87df0b7442c0843b5e60d9787607
tree0cc9b9b87159a7f3b63db7e2672e08661e9c4a63
parentd6acf06916ae38db13967a7510182c2b11a15084
parente2e4d59b7a4a5fce582b118fe4c38b0154c5457f
Merge tag 'upstream/1.2.1'

Upstream version 1.2.1