Merge branch 'MDL-41451_master' of https://github.com/pauln/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 10 Sep 2013 03:59:29 +0000 (11:59 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 10 Sep 2013 03:59:29 +0000 (11:59 +0800)

Trivial merge