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)
1  2 
lang/en/moodle.php

Simple merge