From: root <root@ops.vz.lan>
Date: Mon, 5 Nov 2012 08:52:12 +0000 (+0000)
Subject: Merge branch 'lorea-preprod' of gitorious.org:lorea/elgg into lorea-preprod
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=685de8ae29f68bca65acf5d5b74b24259e45ef41;p=lorea%2Felgg.git

Merge branch 'lorea-preprod' of gitorious.org:lorea/elgg into lorea-preprod
---

685de8ae29f68bca65acf5d5b74b24259e45ef41