Merge branch 'MDL-43410-master' of git://github.com/andrewnicols/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 23 Dec 2013 20:13:05 +0000 (09:13 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 23 Dec 2013 20:13:05 +0000 (09:13 +1300)

Trivial merge