Merge branch 'MDL-33788b-23' of git://github.com/srynot4sale/moodle into MOODLE_23_STABLE
authorSam Hemelryk <sam@moodle.com>
Sun, 15 Jul 2012 21:18:46 +0000 (09:18 +1200)
committerSam Hemelryk <sam@moodle.com>
Sun, 15 Jul 2012 21:18:46 +0000 (09:18 +1200)

Trivial merge