Merge branch 'master' into playable_shots
authorJérôme Benoit <jerome.benoit@piment-noir.org>
Fri, 5 May 2017 18:24:34 +0000 (20:24 +0200)
committerJérôme Benoit <jerome.benoit@piment-noir.org>
Fri, 5 May 2017 18:24:34 +0000 (20:24 +0200)
Signed-off-by: Jérôme Benoit <jerome.benoit@piment-noir.org>

No differences found