Merge tag 'upstream/2.0-beta6+git20150114'
authorDevon Kearns <dookie@kali.org>
Wed, 14 Jan 2015 17:27:48 +0000 (10:27 -0700)
committerDevon Kearns <dookie@kali.org>
Wed, 14 Jan 2015 17:27:48 +0000 (10:27 -0700)
commit2c0a40024c3498b347a22c80cacfecdb3f3378e6
treee07d9f62992872936b791e3e40a397c67bd47b8f
parentb1dade21c7d05c27c347ce38e28a6343cd28b7dd
parent32abd524f67f045658ac1928ffc4a562d9462584
Merge tag 'upstream/2.0-beta6+git20150114'

Upstream version 2.0-beta6+git20150114