From: Cash Costello <cash.costello@gmail.com>
Date: Thu, 13 Jun 2013 11:37:27 +0000 (-0400)
Subject: Merge branch '1.8' of github.com:Elgg/Elgg into 1.8
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=bcfd141620023818cf9515ab9653d85bcf8d82e4;p=lorea%2Felgg.git

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

bcfd141620023818cf9515ab9653d85bcf8d82e4