Merge branch 'MDL-33829_23' of https://github.com/andyjdavis/moodle into MOODLE_23_STABLE
authorSam Hemelryk <sam@moodle.com>
Tue, 2 Oct 2012 21:07:16 +0000 (10:07 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 2 Oct 2012 21:07:16 +0000 (10:07 +1300)

Trivial merge