Merge branch 'MDL-41528_master' of https://github.com/nitzo/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 10 Sep 2013 21:26:44 +0000 (09:26 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 10 Sep 2013 21:26:44 +0000 (09:26 +1200)

Trivial merge