]> git.parisson.com Git - timeside-diadems.git/commit
Merge branch 'release/0.4.4' into dev
authorGuillaume Pellerin <yomguy@parisson.com>
Sat, 27 Jul 2013 12:07:55 +0000 (14:07 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Sat, 27 Jul 2013 12:07:55 +0000 (14:07 +0200)
commitd712fe093cd89a9ce0d0d3c6bcb7d4e6df98ef60
treeb168710b66ad718087a179f25708545f0d4cd36c
parent5028552929c90751ab020abcddfd118fbe08bd46
parent8ae1b03a88e49e4f211491688e8062e3fd2a75df
Merge branch 'release/0.4.4' into dev

Conflicts:
README.rst
setup.py
timeside/__init__.py
README.rst
setup.py