Merge branch 'master_MDL-39572' of https://github.com/totara/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 19 Aug 2013 07:42:17 +0000 (15:42 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 19 Aug 2013 07:42:17 +0000 (15:42 +0800)

Trivial merge