Merge branch 'wip-MDL-35833-master' of git://github.com/phalacee/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 23 Dec 2012 22:43:59 +0000 (11:43 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 23 Dec 2012 22:43:59 +0000 (11:43 +1300)

Trivial merge