Merge branch 'MDL-45607_master' of https://github.com/markn86/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 25 May 2014 21:53:41 +0000 (09:53 +1200)
committerSam Hemelryk <sam@moodle.com>
Sun, 25 May 2014 21:53:41 +0000 (09:53 +1200)

Trivial merge