Merge branch 'MDL-38903-master' of git://github.com/phalacee/moodle
authorDamyon Wiese <damyon@moodle.com>
Thu, 27 Feb 2014 05:18:27 +0000 (13:18 +0800)
committerDamyon Wiese <damyon@moodle.com>
Thu, 27 Feb 2014 05:18:27 +0000 (13:18 +0800)

Trivial merge