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)
commit97f236e747f03b1d9b8924b16a536023f77c39da
tree12ce4233bc8dd50aa50b50d36491c725e9774fa2
parent28cfdfe180e60f5432f47ec1dd2dd4d2d24fa6aa
parentaf5d990b59a40720f4dc8197f7238eb707e61c9c
Merge branch 'MDL-32341-master' of git://github.com/ankitagarwal/moodle
lang/en/admin.php