Merge branch 'MDL-31710' of git://github.com/stronk7/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 5 Mar 2012 00:36:34 +0000 (13:36 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 5 Mar 2012 00:36:34 +0000 (13:36 +1300)

Trivial merge