Merge branch 'MDL-32888_master' of https://github.com/maitkin-ltu/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 2 Dec 2013 07:01:37 +0000 (15:01 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 2 Dec 2013 07:01:37 +0000 (15:01 +0800)

Trivial merge