Merge branch 'MDL-29174-master' of git://github.com/raymanuk/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 16 Apr 2012 05:37:06 +0000 (17:37 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 16 Apr 2012 05:37:06 +0000 (17:37 +1200)

Trivial merge