Merge branch 'wip-MDL-26869-m23-after-MDL-26155' of git://github.com/samhemelryk...
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 4 Jan 2012 02:08:24 +0000 (03:08 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 4 Jan 2012 02:08:24 +0000 (03:08 +0100)
commit45ad2d871cf9ebad6ac36e0fcf17db4b71f68b40
tree82a08d9d7ab5020a1aa5d3cd7705e0a58f5a387c
parenta1373126eb3dc8332d371dbef3b89b37038e2723
parent83f78f8dac061ed3d861daf0b127dce4387ac44b
Merge branch 'wip-MDL-26869-m23-after-MDL-26155' of git://github.com/samhemelryk/moodle
lang/en/admin.php
lib/navigationlib.php