Merge branch 'MDL-39617-master' of https://github.com/lucisgit/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 3 Feb 2014 19:41:37 +0000 (08:41 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 3 Feb 2014 19:41:37 +0000 (08:41 +1300)

Trivial merge