From: Sem <sembrestels@riseup.net>
Date: Sat, 31 Dec 2011 19:14:45 +0000 (+0100)
Subject: Merge git://github.com/Elgg/Elgg
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=9f4da6d87f2c520b975f968cedbcde4f3dce1a25;p=lorea%2Felgg.git

Merge git://github.com/Elgg/Elgg
---

9f4da6d87f2c520b975f968cedbcde4f3dce1a25