Merge branch 'MDL-36334-master' of git://github.com/andrewnicols/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 5 Jan 2014 20:53:15 +0000 (09:53 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 5 Jan 2014 20:53:15 +0000 (09:53 +1300)

Trivial merge