Merge branch 'MDL-41995_master' of https://github.com/markn86/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 1 Oct 2013 01:50:53 +0000 (14:50 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 1 Oct 2013 01:50:53 +0000 (14:50 +1300)

Trivial merge