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)
commitd2e2f526b9dcaecde3b7e0f7cc77b2124bddb509
tree9aceef8866f9a078e707ee0d68722f3e8fadd847
parent361fb5cd72c6d22021516490db57147c606816b4
parentf5968248f573d5cef19a350edc0a6323b99890d5
Merge branch 'master' into gamnit

Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>