]> git.parisson.com Git - telemeta.git/commit
Merge branch 'dev' into crem2
authorGuillaume Pellerin <yomguy@parisson.com>
Tue, 16 Apr 2013 11:03:20 +0000 (13:03 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Tue, 16 Apr 2013 11:03:20 +0000 (13:03 +0200)
commit4e41bbf665ee87323635d64412a103ff151b27b1
tree4a2912e54c66a58c67c329f8b3859c760ba42470
parent3b5336378f31b13fe2b50369b2fff5b2d83b8e04
parentdd74ad43e250cbdd78d3d17d067ee7fc4dd6c599
Merge branch 'dev' into crem2

Conflicts:
telemeta/models/query.py
telemeta/models/query.py