Merge branch 'MDL-41748_master' of https://github.com/markn86/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 16 Sep 2013 01:48:48 +0000 (13:48 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 16 Sep 2013 01:48:48 +0000 (13:48 +1200)

Trivial merge