Merge branch 'MDL-43083-master' of git://github.com/phalacee/moodle
authorDamyon Wiese <damyon@moodle.com>
Wed, 4 Dec 2013 01:52:51 +0000 (09:52 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 4 Dec 2013 01:52:51 +0000 (09:52 +0800)

Trivial merge