Merge branch 'MDL-29103' of git://github.com/mouneyrac/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 5 Jun 2012 04:42:30 +0000 (12:42 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 5 Jun 2012 04:42:30 +0000 (12:42 +0800)
1  2 
lang/en/admin.php

Simple merge