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)
commit01e2a72ce30f0fbb4a027d3246a8ba16e00ae197
tree22fc0d2b7016d34d48fad45c88349b0103cd8308
parent71a21f8fa46e8ea834fe3381abdadde59788d37b
parentf72a3bf28f4bf001106ad4d42ae7eb4f61b77828
Merge remote-tracking branch 'kali-github/pr/2'