Merge branch 'wip-MDL-37869-master' of git://github.com/phalacee/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 23 Jul 2013 23:28:26 +0000 (11:28 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 23 Jul 2013 23:28:26 +0000 (11:28 +1200)

Trivial merge