Merge branch 'wip-MDL-38442-m23' of git://github.com/samhemelryk/moodle into MOODLE_2...
authorDan Poltawski <dan@moodle.com>
Tue, 9 Apr 2013 07:40:38 +0000 (15:40 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 9 Apr 2013 07:40:38 +0000 (15:40 +0800)

Trivial merge