Merge branch 'MDL-32908' of git://github.com/danpoltawski/moodle
commita9efc8ddb8ac00e0d195c80bb8d07a2e293039aa
authorSam Hemelryk <sam@moodle.com>
Tue, 19 Jun 2012 22:31:52 +0000 (20 10:31 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 19 Jun 2012 22:31:52 +0000 (20 10:31 +1200)
treea3d7df10ac100e823703dd74abb8a79b500d8cc6
parentec1ca38996bc1b336cbc35fe43b5ff6b4660ccae
parenta80b5a0cf0f1c9f8284b5ee6db92bef34774f99b
Merge branch 'MDL-32908' of git://github.com/danpoltawski/moodle
lang/en/moodle.php