Merge branch 'MDL-38657_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Wed, 3 Apr 2013 08:51:39 +0000 (16:51 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 3 Apr 2013 08:51:39 +0000 (16:51 +0800)

Trivial merge