Merge branch 'MDL-32341-master' of git://github.com/ankitagarwal/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 15 Jan 2013 04:38:22 +0000 (12:38 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 15 Jan 2013 04:38:22 +0000 (12:38 +0800)
1  2 
lang/en/admin.php

Simple merge