Merge remote-tracking branch 'kali-github/pr/2' origin/HEAD origin/master
authorKali Kaneko (leap communications) <kali@leap.se>
Tue, 3 May 2016 00:13:19 +0000 (20:13 -0400)
committerKali Kaneko (leap communications) <kali@leap.se>
Tue, 3 May 2016 00:13:19 +0000 (20:13 -0400)

Trivial merge