From: Thomas Fillon Date: Wed, 22 Oct 2014 15:31:27 +0000 (+0200) Subject: Merge branch 'dev' of github.com:yomguy/TimeSide into dev X-Git-Tag: 0.6~4^2^2 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=4a7f1187afd3aeeb1f857c63057b5c2e277caf1f;p=timeside.git Merge branch 'dev' of github.com:yomguy/TimeSide into dev --- 4a7f1187afd3aeeb1f857c63057b5c2e277caf1f