Merge branch 'wip-MDL-36386-m24' of git://github.com/samhemelryk/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 7 Nov 2012 01:33:47 +0000 (09:33 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 7 Nov 2012 01:33:47 +0000 (09:33 +0800)
Conflicts:
version.php


Trivial merge