Merge branch 'MDL-39283_23' of git://github.com/jmvedrine/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Wed, 24 Apr 2013 13:36:26 +0000 (14:36 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 24 Apr 2013 13:36:26 +0000 (14:36 +0100)

Trivial merge