Merge branch 'MDL-39728_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Mon, 20 May 2013 07:29:21 +0000 (15:29 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 20 May 2013 07:29:21 +0000 (15:29 +0800)

Trivial merge