]> git.parisson.com Git - timeside.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)
commita07786c6db09922afe54305845d0c132b2825d4b
tree2fd7c0c7c90e7cd3a365f5a448fa79a7ee4bbec6
parentc6bbb46e90d832048a9a3a55e24193f7193388d5
parentdacd5a10db143181c92a2741ad1867bc66ed33e9
Merge branch 'release/0.4.4' into dev

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