Merge tag 'upstream/1.0'
authorDevon Kearns <dookie@kali.org>
Fri, 15 Feb 2013 17:52:37 +0000 (10:52 -0700)
committerDevon Kearns <dookie@kali.org>
Fri, 15 Feb 2013 17:52:37 +0000 (10:52 -0700)
commitd4659fdb3791bc8dc367bf8eb6ef9a81f24a89e1
tree0af26c5cc887cc37ea66a2aa0536c79c0d7390b6
parent2faddc763b741a1b2af8cb80a790690368504510
parent099fd67ac5f6f080d67173e5949ac2a700263476
Merge tag 'upstream/1.0'

Upstream version 1.0