Merge branch 'MDL-34779-master' of git://github.com/ankitagarwal/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 20 Aug 2012 07:58:22 +0000 (15:58 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 20 Aug 2012 07:58:22 +0000 (15:58 +0800)
1  2 
lang/en/admin.php

Simple merge