From: Guillaume Pellerin <yomguy@parisson.com>
Date: Mon, 20 Jan 2014 21:52:12 +0000 (+0100)
Subject: Merge branch 'dev' into feature/ts-0.5
X-Git-Tag: 1.4.5-1~3^2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=b2fb16a06554068562da5403f141e157bafe64cf;p=telemeta.git

Merge branch 'dev' into feature/ts-0.5

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

b2fb16a06554068562da5403f141e157bafe64cf