Merge branch 'MDL-32203c' of git://github.com/srynot4sale/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 23 May 2012 23:42:39 +0000 (11:42 +1200)
committerSam Hemelryk <sam@moodle.com>
Wed, 23 May 2012 23:42:39 +0000 (11:42 +1200)

Trivial merge