Merge branch 'MDL-43438-master' of git://github.com/FMCorz/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 23 Dec 2013 22:23:15 +0000 (11:23 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 23 Dec 2013 22:23:15 +0000 (11:23 +1300)

Trivial merge