Merge branch 'MDL-42932_master' of https://github.com/markn86/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 10 Dec 2013 23:30:26 +0000 (12:30 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 10 Dec 2013 23:30:26 +0000 (12:30 +1300)

Trivial merge