Merge branch 'm28_MDL-47186' of https://github.com/totara/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 15 Sep 2014 06:16:59 +0000 (14:16 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 15 Sep 2014 06:16:59 +0000 (14:16 +0800)

Trivial merge