]> git.parisson.com Git - timeside.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)
commit301b8a7d920e3e984e2d85b450d21deb801fd538
treee8dff17e5730e51deb7f55585d8dc6f7d85ac30e
parent9f9f8c898cf284b97fd8c02e7e5e119c3e55287c
parente1e97086150dc5d0d3ad2ff7415c1cd8bb86fc43
Merge branch 'dev'

Conflicts:
doc/source/news.rst