]> git.parisson.com Git - timeside-diadems.git/commit
Merge branch 'dev'
authorGuillaume Pellerin <yomguy@parisson.com>
Sun, 10 Nov 2013 08:16:34 +0000 (09:16 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Sun, 10 Nov 2013 08:16:34 +0000 (09:16 +0100)
commit6259aef70bef047d531865cf5843af1db9fdb39a
tree8b24b66e222b135cae5a04a9690a7ad099ecb253
parent37a6b3886cbac95ad0a23c53502452aa12fedae6
parent2635de58bf7b39d81593ac8439243d0f6edf9478
Merge branch 'dev'

Conflicts:
doc/source/news.rst