Merge branch 'wip-files23' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 21 May 2012 10:19:32 +0000 (18:19 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 21 May 2012 10:19:32 +0000 (18:19 +0800)
1  2 
lang/en/moodle.php

Simple merge