Merge branch 'MDL-45678-006-master' of https://github.com/dbezborodovrp/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 7 Jul 2014 21:42:35 +0000 (09:42 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 7 Jul 2014 21:42:35 +0000 (09:42 +1200)

Trivial merge