Merge branch 'MDL-42742-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 7 Nov 2013 03:19:15 +0000 (11:19 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 7 Nov 2013 03:19:15 +0000 (11:19 +0800)

Trivial merge