Merge branch 'wip-MDL-36379-m23' of git://github.com/samhemelryk/moodle into MOODLE_2...
authorDan Poltawski <dan@moodle.com>
Tue, 6 Nov 2012 01:50:23 +0000 (09:50 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 6 Nov 2012 01:50:23 +0000 (09:50 +0800)

Trivial merge