]> git.parisson.com Git - timeside-diadems.git/commit
Merge branch 'dev'
authorGuillaume Pellerin <yomguy@parisson.com>
Wed, 9 Apr 2014 00:02:40 +0000 (02:02 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Wed, 9 Apr 2014 00:02:40 +0000 (02:02 +0200)
commitfed75f11f238f7af6090479c821e0d2944a15289
treea6cdcdc9159ebb294fd4edd60d44f1f73607511a
parent3fe1bf68776c98ed3a5c6d0d281c1afa92f862bc
parent720cf26bd68f4c2a49d9e7d5057a5d40b04af655
Merge branch 'dev'

Conflicts:
setup.py
timeside/__init__.py