]> git.parisson.com Git - timeside.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)
commita861b4b1f0ccaa0a81e5f67a00962bc57515f3f5
treee8fdbf8b087c4e6149b3a66eb5baa73af23adb75
parent071260621aac0d106460b7323f2f907ae3fdf645
parent7f3568288fb9b348a086b3e1a388ea293babf060
Merge branch 'dev'

Conflicts:
setup.py
timeside/__init__.py