Merge branch 'MDL-41401-master' of git://github.com/danpoltawski/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 27 Aug 2013 07:09:21 +0000 (15:09 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 27 Aug 2013 07:09:21 +0000 (15:09 +0800)

Trivial merge