Merge branch 'MDL-29176' of git://github.com/timhunt/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 18 Dec 2011 23:28:52 +0000 (12:28 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 18 Dec 2011 23:28:52 +0000 (12:28 +1300)

Trivial merge