From: Brett Profitt <brett.profitt@gmail.com>
Date: Sun, 22 Apr 2012 23:41:46 +0000 (-0700)
Subject: Merge branch '1.8' of github.com:Elgg/Elgg into 1.8
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=6653c1f66bca719426965d12235f08b05deed187;p=lorea%2Felgg.git

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

6653c1f66bca719426965d12235f08b05deed187