]> gitweb.fluxo.info Git - lorea/elgg.git/commitdiff
Merge branch 'pr-309' into 1.8
authorBrett Profitt <brett.profitt@gmail.com>
Sun, 16 Dec 2012 22:32:01 +0000 (17:32 -0500)
committerBrett Profitt <brett.profitt@gmail.com>
Sun, 16 Dec 2012 22:32:01 +0000 (17:32 -0500)
1  2 
engine/lib/admin.php
languages/en.php

Simple merge
Simple merge