Merge branch 'MDL-40668-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 13 Aug 2013 03:14:37 +0000 (11:14 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 13 Aug 2013 03:14:37 +0000 (11:14 +0800)

Trivial merge