From: Brett Profitt <brett.profitt@gmail.com>
Date: Tue, 8 Jan 2013 16:56:21 +0000 (-0500)
Subject: Merge branch '1.8' of github.com:Elgg/Elgg into 1.8
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=41a4e14255894874be61347e3c65ced96e38b386;p=lorea%2Felgg.git

Merge branch '1.8' of github.com:Elgg/Elgg into 1.8
---

41a4e14255894874be61347e3c65ced96e38b386