Merge branch 'MDL-34867-master' of https://github.com/tbannister/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 30 Nov 2014 21:45:04 +0000 (10:45 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 30 Nov 2014 21:45:04 +0000 (10:45 +1300)

Trivial merge