Merge branch 'MDL-44447-master' of git://github.com/lameze/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 15 Sep 2014 08:44:41 +0000 (16:44 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 15 Sep 2014 08:44:41 +0000 (16:44 +0800)

Trivial merge