Merge branch 'MDL-35593-23' of git://github.com/mouneyrac/moodle into MOODLE_23_STABLE
authorSam Hemelryk <sam@moodle.com>
Tue, 11 Dec 2012 20:38:27 +0000 (09:38 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 11 Dec 2012 20:38:27 +0000 (09:38 +1300)

Trivial merge