Merge branch 'MDL-32005-master-10' of git://git.luns.net.uk/moodle
authorAparup Banerjee <aparup@moodle.com>
Wed, 16 May 2012 02:39:48 +0000 (10:39 +0800)
committerAparup Banerjee <aparup@moodle.com>
Wed, 16 May 2012 02:39:48 +0000 (10:39 +0800)
commite7ebfb8058705fc40b8ff205256697f2abebf8c3
treefd141b8772ac78ef02ce5b929f62a6507be68815
parent19d1525f6b4065824b3e48479e33cf407bc16f94
parent74b714df7e18284057f0599d4e480547c0f014ce
Merge branch 'MDL-32005-master-10' of git://git.luns.net.uk/moodle

- fixed up comments (was phpdoc blocks)
lang/en/moodle.php