Merge branch 'wip-MDL-33749-master' of https://github.com/kwiliarty/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 3 Jul 2012 20:33:14 +0000 (08:33 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 3 Jul 2012 20:33:14 +0000 (08:33 +1200)

Trivial merge