Merge branch 'MDL-39203-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Thu, 18 Apr 2013 07:36:32 +0000 (08:36 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 18 Apr 2013 07:36:32 +0000 (08:36 +0100)

Trivial merge