Merge branch 'MDL-45652_master' of https://github.com/markn86/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 24 Jun 2014 08:58:04 +0000 (16:58 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 24 Jun 2014 08:58:04 +0000 (16:58 +0800)

Trivial merge