Merge branch 'MDL-42905-master' of git://github.com/sammarshallou/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 19 Nov 2013 01:37:28 +0000 (14:37 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 19 Nov 2013 01:37:28 +0000 (14:37 +1300)

Trivial merge