Merge branch 'MDL-29190_master_wip' of git://github.com/grabs/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 25 Sep 2011 21:38:54 +0000 (10:38 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 25 Sep 2011 21:38:54 +0000 (10:38 +1300)

Trivial merge