]> git.parisson.com Git - telemeta.git/commit
Merge branch 'master' into dev
authorGuillaume Pellerin <yomguy@parisson.com>
Mon, 20 Jan 2014 21:51:23 +0000 (22:51 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Mon, 20 Jan 2014 21:51:23 +0000 (22:51 +0100)
commit6534b9593a9aff2d6f5e18de8d87371165d920b4
tree0ff2df70022e9984e46a11a24dffc3b068ce9c3a
parent7d303f030ad79d2284545b5e280439cf85635669
parent5e29e034559a6f3046ff18eefdf67cda5d625f96
Merge branch 'master' into dev

Conflicts:
example/sandbox/settings.py
setup.py
example/sandbox/settings.py
setup.py