Merge branch 'MDL-38061-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Mon, 25 Feb 2013 02:21:05 +0000 (10:21 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 25 Feb 2013 02:21:05 +0000 (10:21 +0800)

Trivial merge