]> git.parisson.com Git - timeside-diadems.git/commit
Merge branch 'master' into dev
authorGuillaume Pellerin <yomguy@parisson.com>
Mon, 30 Sep 2013 10:37:30 +0000 (12:37 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Mon, 30 Sep 2013 10:37:30 +0000 (12:37 +0200)
commitd869437359498402405a7a57da1bb75c0fcba412
tree3c84a4bc396cd6adf7d766e29a80b80c232c5c84
parent48515d9f9c279cd00fdf1c0f22c6e5053e8fe6dc
parentb22011b97e619213ce4b6950c4e6f6890490ac0c
Merge branch 'master' into dev

Conflicts:
README.rst
README.rst
setup.py