Merge branch 'MDL-42546-master' of git://github.com/danpoltawski/moodle
authorDamyon Wiese <damyon@moodle.com>
Sat, 2 Nov 2013 14:39:37 +0000 (22:39 +0800)
committerDamyon Wiese <damyon@moodle.com>
Sat, 2 Nov 2013 14:39:37 +0000 (22:39 +0800)

Trivial merge