Merge branch 'MDL-44433-master' of git://github.com/danpoltawski/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 18 Mar 2014 01:35:55 +0000 (14:35 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 18 Mar 2014 01:35:55 +0000 (14:35 +1300)

Trivial merge