From: Brett Profitt <brett.profitt@gmail.com>
Date: Tue, 23 Aug 2011 16:16:20 +0000 (-0700)
Subject: Merge branch 'master' of github.com:Elgg/Elgg
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=3e1a96cabb228b59021676772daca23b22a026c7;p=lorea%2Felgg.git

Merge branch 'master' of github.com:Elgg/Elgg

Conflicts:
	engine/lib/views.php
---

3e1a96cabb228b59021676772daca23b22a026c7