Merge branch 'MDL-30309' of git://github.com/lazydaisy/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 20 Nov 2011 23:01:45 +0000 (12:01 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 20 Nov 2011 23:01:45 +0000 (12:01 +1300)

Trivial merge