From: Brett Profitt <brett.profitt@gmail.com>
Date: Thu, 21 Feb 2013 15:21:33 +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=88b7f8a3a32542e8b016c2163f44e1ebce7211fc;p=lorea%2Felgg.git

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

88b7f8a3a32542e8b016c2163f44e1ebce7211fc