Merge branch 'MDL-29484' of git://github.com/timhunt/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 26 Sep 2011 00:53:17 +0000 (13:53 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 26 Sep 2011 00:53:17 +0000 (13:53 +1300)

Trivial merge