Merge branch 'MDL-41259_master' of https://github.com/nitzo/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 2 Sep 2013 07:02:12 +0000 (15:02 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 2 Sep 2013 07:02:12 +0000 (15:02 +0800)

Trivial merge