Merge branch 'MDL-33472-master' of git://github.com/danpoltawski/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 3 Sep 2013 06:35:58 +0000 (14:35 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 3 Sep 2013 06:35:58 +0000 (14:35 +0800)

Trivial merge