From: Cash Costello <cash.costello@gmail.com>
Date: Fri, 24 Jun 2011 11:13:18 +0000 (-0400)
Subject: Merge branch '3404-river-revamp' of https://github.com/ewinslow/Elgg into ewinslow... 
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=a3a03a721f62bcf1426a475a543b0b1fcd322bcf;p=lorea%2Felgg.git

Merge branch '3404-river-revamp' of https://github.com/ewinslow/Elgg into ewinslow-3404-river-revamp

Conflicts:
	languages/en.php
---

a3a03a721f62bcf1426a475a543b0b1fcd322bcf