Merge branch 'MDL-41249-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 26 Aug 2013 05:11:04 +0000 (13:11 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 26 Aug 2013 05:11:04 +0000 (13:11 +0800)

Trivial merge