Merge branch 'MDL-31975_master' of git://github.com/kordan/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 13 Mar 2012 22:23:39 +0000 (11:23 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 13 Mar 2012 22:23:39 +0000 (11:23 +1300)

Trivial merge