Merge branch 'MDL-43194-master' of git://github.com/andrewnicols/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 9 Dec 2013 19:48:33 +0000 (08:48 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 9 Dec 2013 19:48:33 +0000 (08:48 +1300)

Trivial merge