Merge branch 'MDL-43969-master' of git://github.com/andrewnicols/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 9 Feb 2014 20:48:19 +0000 (09:48 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 9 Feb 2014 20:48:19 +0000 (09:48 +1300)

Trivial merge