Merge branch 'MDL-39446_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Mon, 6 May 2013 13:48:23 +0000 (14:48 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 6 May 2013 13:48:23 +0000 (14:48 +0100)

Trivial merge