Merge branch 'MDL-42084-master' of git://github.com/sammarshallou/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 4 Dec 2013 19:25:35 +0000 (08:25 +1300)
committerSam Hemelryk <sam@moodle.com>
Wed, 4 Dec 2013 19:25:35 +0000 (08:25 +1300)

Trivial merge