From: yomguy <yomguy@parisson.com>
Date: Mon, 6 Feb 2012 21:59:57 +0000 (+0100)
Subject: Merge branch 'crem' of git+ssh://vcs.parisson.com/var/git/telemeta
X-Git-Tag: 1.3.9~3^2~1
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=aef89d3d58fcf23008496025c768d481a87ef8f5;p=telemeta.git

Merge branch 'crem' of git+ssh://vcs.parisson.com/var/git/telemeta

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

aef89d3d58fcf23008496025c768d481a87ef8f5