Merge branch 'MDL-28124_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE
authorSam Hemelryk <sam@moodle.com>
Sun, 23 Jun 2013 22:28:46 +0000 (10:28 +1200)
committerSam Hemelryk <sam@moodle.com>
Sun, 23 Jun 2013 22:28:46 +0000 (10:28 +1200)

Trivial merge