Merge branch 'MDL-38999_23' of git://github.com/stronk7/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Wed, 10 Apr 2013 02:36:00 +0000 (10:36 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 10 Apr 2013 02:36:00 +0000 (10:36 +0800)

Trivial merge