Merge branch 'MDL-47594_master' of git://github.com/kordan/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 15 Oct 2014 22:04:53 +0000 (11:04 +1300)
committerSam Hemelryk <sam@moodle.com>
Wed, 15 Oct 2014 22:04:53 +0000 (11:04 +1300)

Trivial merge