Merge branch 'MDL-31647-master' of git://github.com/sammarshallou/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 19 Feb 2012 23:03:32 +0000 (12:03 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 19 Feb 2012 23:03:32 +0000 (12:03 +1300)

Trivial merge