Merge branch 'MDL-31040-master-2' of git://git.luns.net.uk/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 16 Jan 2012 02:54:08 +0000 (10:54 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 16 Jan 2012 02:54:08 +0000 (10:54 +0800)
commit66fe8d59c87b7812dc7b5a941e89ae878728fd6e
treee535ccbe6d5350aebbeae64c77f088912d6b407b
parent89aac2b3cd1654a69739c14c5fb31fd44315e7b1
parent6dc5908ef76a7a56b848cb28ffc9f4f490371599
Merge branch 'MDL-31040-master-2' of git://git.luns.net.uk/moodle
lang/en/moodle.php