Merge branch 'MDL-36346_23' of git://github.com/pauln/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Wed, 7 Nov 2012 01:27:53 +0000 (09:27 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 7 Nov 2012 01:27:53 +0000 (09:27 +0800)

Trivial merge