Merge branch 'wip-MDL-39227-master' of git://github.com/phalacee/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 9 Jun 2013 23:43:31 +0000 (11:43 +1200)
committerSam Hemelryk <sam@moodle.com>
Sun, 9 Jun 2013 23:43:31 +0000 (11:43 +1200)

Trivial merge