Merge branch 'wip-MDL-36576-m23' of git://github.com/amygroshek/moodle into MOODLE_23...
authorDan Poltawski <dan@moodle.com>
Thu, 15 Nov 2012 00:57:02 +0000 (08:57 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 15 Nov 2012 00:57:02 +0000 (08:57 +0800)

Trivial merge