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

Simple merge