Merge branch 'master_MDL-35380' of git://github.com/danmarsden/moodle
authorDamyon Wiese <damyon@moodle.com>
Wed, 21 Aug 2013 03:38:37 +0000 (11:38 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 21 Aug 2013 03:38:37 +0000 (11:38 +0800)

Trivial merge