Merge branch 'wip-MDL-35885-master' of git://github.com/phalacee/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 14 Jan 2013 00:40:06 +0000 (13:40 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 14 Jan 2013 00:40:06 +0000 (13:40 +1300)

Trivial merge