Merge branch 'MDL-36835-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Mon, 10 Dec 2012 06:02:24 +0000 (14:02 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 10 Dec 2012 06:02:24 +0000 (14:02 +0800)

Trivial merge