From: yomguy <yomguy@parisson.com>
Date: Mon, 1 Oct 2012 13:05:53 +0000 (+0200)
Subject: Merge branch 'dev' into crem
X-Git-Tag: 1.4.5~2^2~4^2~2^2~33^2~23^2~3
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=2514949c36bc9ab7945fe64b3aaaa98632a32f90;p=telemeta.git

Merge branch 'dev' into crem

Conflicts:
	telemeta/templates/telemeta/base.html
---

2514949c36bc9ab7945fe64b3aaaa98632a32f90