From: yomguy <yomguy@parisson.com>
Date: Thu, 31 May 2012 21:24:58 +0000 (+0200)
Subject: Merge branch 'dev'
X-Git-Tag: registration~2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=01f1b2e30a586853112ed5455c40fe9696eb5fe9;p=telemeta.git

Merge branch 'dev'
---

01f1b2e30a586853112ed5455c40fe9696eb5fe9