Merge branch 'wip-MDL-39949-master' of git://github.com/phalacee/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 16 Jun 2013 22:01:10 +0000 (10:01 +1200)
committerSam Hemelryk <sam@moodle.com>
Sun, 16 Jun 2013 22:01:10 +0000 (10:01 +1200)

Trivial merge