Merge branch 'MDL-29211_master' of git://github.com/kordan/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 12 Sep 2011 07:48:33 +0000 (19:48 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 12 Sep 2011 07:48:33 +0000 (19:48 +1200)

Trivial merge