From: root <root@migration.vz.lan>
Date: Tue, 23 Oct 2012 08:54:45 +0000 (+0000)
Subject: Merge commit '148139d'
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=96f16a48ab4a30998e94387f61622cc600f9f01f;p=lorea%2Felgg.git

Merge commit '148139d'

Conflicts:
	upgrades/2012022501.php
---

96f16a48ab4a30998e94387f61622cc600f9f01f