Merge branch 'MDL-30500' of git://github.com/lazydaisy/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 19 Dec 2011 02:21:56 +0000 (15:21 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 19 Dec 2011 02:21:56 +0000 (15:21 +1300)

Trivial merge