Merge branch 'MDL-43326-master' of git://github.com/damyon/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 15 Dec 2013 20:46:47 +0000 (09:46 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 15 Dec 2013 20:46:47 +0000 (09:46 +1300)

Trivial merge