]> git.parisson.com Git - telemeta.git/commit
Merge branch 'dev' of /var/git/telemeta
authorGuillaume Pellerin <yomguy@parisson.com>
Wed, 2 May 2012 14:06:48 +0000 (16:06 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Wed, 2 May 2012 14:06:48 +0000 (16:06 +0200)
commit42d8c45d680d52622d7c3c72a280b6d58601214d
tree57a2f207309c62481cabe65ba00c716d5995e7c6
parent84d12a33616dfc8a91223772bd1a52a836942cda
parent20ef7d80a27aceda8f8266b7404d0b37a7ecf7ca
Merge branch 'dev' of /var/git/telemeta

Conflicts:
telemeta/models/__init__.py
telemeta/models/__init__.py
telemeta/views/base.py