]> git.parisson.com Git - timeside-diadems.git/commit
Merge branch 'master' into dev
authorGuillaume Pellerin <yomguy@parisson.com>
Thu, 17 Oct 2013 01:03:01 +0000 (03:03 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Thu, 17 Oct 2013 01:03:01 +0000 (03:03 +0200)
commitd9f5565aa7c58180b79c14d70594d4f02d2a178d
tree5f51115fdeae52cf915b611201982d4bdd559e24
parent71f41e3a2796d276be6f784f0eec68fd258da8b9
parent96464061c36701cc4dc4c59e80279c39eebe4946
Merge branch 'master' into dev

Conflicts:
README.rst