Merge branch 'MDL-41098-master-fix1' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 28 Aug 2013 02:00:46 +0000 (10:00 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 28 Aug 2013 02:00:46 +0000 (10:00 +0800)

Trivial merge