Merge branch 'MDL-35190-MOODLE_23_STABLE' of git://github.com/mouneyrac/moodle into...
authorSam Hemelryk <sam@moodle.com>
Tue, 11 Sep 2012 04:45:45 +0000 (16:45 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 11 Sep 2012 04:45:45 +0000 (16:45 +1200)

Trivial merge