Merge branch 'MDL-44334-master' of git://github.com/andrewnicols/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 10 Mar 2014 21:10:08 +0000 (10:10 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 10 Mar 2014 21:10:08 +0000 (10:10 +1300)

Trivial merge