From: Brett Profitt <brett.profitt@gmail.com>
Date: Mon, 10 Dec 2012 20:35:22 +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=4c517db146cb1c59c8a54d9e87b9e5a4ae17987e;p=lorea%2Felgg.git

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

4c517db146cb1c59c8a54d9e87b9e5a4ae17987e