Merge branch 'MDL-25901-23' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE
authorSam Hemelryk <sam@moodle.com>
Tue, 11 Jun 2013 20:59:32 +0000 (08:59 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 11 Jun 2013 20:59:32 +0000 (08:59 +1200)

Trivial merge