From: Guillaume Pellerin <yomguy@parisson.com>
Date: Thu, 22 Aug 2013 14:53:15 +0000 (+0200)
Subject: Merge branch 'ae' into ae-dev
X-Git-Tag: 2.8.1-ae~115
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=5489fc79234349d0c606a3d1bc483b92f2d02a7d;p=teleforma.git

Merge branch 'ae' into ae-dev
re-add analytics

Conflicts:
	teleforma/templates/postman/email_user_init.txt
---

5489fc79234349d0c606a3d1bc483b92f2d02a7d