Merge branch 'master' into gamnit
authorAlexis Laferrière <alexis.laf@xymus.net>
Tue, 15 Sep 2015 01:39:01 +0000 (21:39 -0400)
committerAlexis Laferrière <alexis.laf@xymus.net>
Tue, 15 Sep 2015 01:39:01 +0000 (21:39 -0400)
Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>


Trivial merge