Merge branch 'MDL-27748' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 20 May 2013 07:46:49 +0000 (15:46 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 20 May 2013 07:46:49 +0000 (15:46 +0800)

Trivial merge