Merge branch 'MDL-46911' of https://github.com/bostelm/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 1 Sep 2014 07:42:01 +0000 (15:42 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 1 Sep 2014 07:42:01 +0000 (15:42 +0800)

Trivial merge