Merge branch 'MDL-38702_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Tue, 2 Apr 2013 02:04:56 +0000 (10:04 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 2 Apr 2013 02:04:56 +0000 (10:04 +0800)

Trivial merge