Merge branch 'MDL-34647_23' of git://github.com/aolley/moodle into MOODLE_23_STABLE
authorSam Hemelryk <sam@moodle.com>
Sun, 5 Aug 2012 22:58:44 +0000 (10:58 +1200)
committerSam Hemelryk <sam@moodle.com>
Sun, 5 Aug 2012 22:58:44 +0000 (10:58 +1200)

Trivial merge