Merge branch 'master_MDL-31749' of git://github.com/danmarsden/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 4 Mar 2012 23:30:36 +0000 (12:30 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 4 Mar 2012 23:30:36 +0000 (12:30 +1300)

Trivial merge