Merge branch 'MDL-36667-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Mon, 7 Jan 2013 01:45:15 +0000 (09:45 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 7 Jan 2013 01:45:15 +0000 (09:45 +0800)

Trivial merge