Merge branch 'MDL-31496_23' of git://github.com/dmonllao/moodle into MOODLE_23_STABLE
authorSam Hemelryk <sam@moodle.com>
Mon, 3 Sep 2012 00:20:25 +0000 (12:20 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 3 Sep 2012 00:20:25 +0000 (12:20 +1200)

Trivial merge