Merge branch 'MDL-36315_23' of git://github.com/stronk7/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Thu, 1 Nov 2012 02:03:19 +0000 (10:03 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 1 Nov 2012 02:03:19 +0000 (10:03 +0800)

Trivial merge