Merge branch 'MDL-32064' of git://github.com/timhunt/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 19 Mar 2012 21:37:38 +0000 (10:37 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 19 Mar 2012 21:37:38 +0000 (10:37 +1300)

Trivial merge