Merge branch 'MDL-36002-master-fix1' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 14 Aug 2013 06:51:31 +0000 (14:51 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 14 Aug 2013 06:51:31 +0000 (14:51 +0800)

Trivial merge