From: yomguy <yomguy@parisson.com>
Date: Mon, 6 Feb 2012 22:38:53 +0000 (+0100)
Subject: Merge branch 'master' of git+ssh://vcs.parisson.com/var/git/telemeta
X-Git-Tag: 1.3.9~3
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=746563a2dad78d4e7fa7ac9c3877f54c71fe9cc4;p=telemeta.git

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

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

746563a2dad78d4e7fa7ac9c3877f54c71fe9cc4