Merge branch 'MDL-27619_23' of git://github.com/pauln/moodle into MOODLE_23_STABLE
authorSam Hemelryk <sam@moodle.com>
Tue, 11 Dec 2012 22:09:32 +0000 (11:09 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 11 Dec 2012 22:09:32 +0000 (11:09 +1300)

Trivial merge