From: Guillaume Pellerin <yomguy@parisson.com>
Date: Tue, 16 Apr 2013 11:03:20 +0000 (+0200)
Subject: Merge branch 'dev' into crem2
X-Git-Tag: 1.4.5~2^2~4^2~2^2~5
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=4e41bbf665ee87323635d64412a103ff151b27b1;p=telemeta.git

Merge branch 'dev' into crem2

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

4e41bbf665ee87323635d64412a103ff151b27b1