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

Trivial merge