]> git.parisson.com Git - timeside.git/commitdiff
Merge branch 'diadems' of github.com:yomguy/TimeSide into diadems
authorGuillaume Pellerin <yomguy@parisson.com>
Mon, 19 May 2014 13:25:32 +0000 (15:25 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Mon, 19 May 2014 13:25:32 +0000 (15:25 +0200)

Trivial merge