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

Trivial merge