Merge branch 'MDL-35517_23' of git://github.com/stronk7/moodle into MOODLE_23_STABLE
authorSam Hemelryk <sam@moodle.com>
Mon, 24 Sep 2012 03:21:28 +0000 (15:21 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 24 Sep 2012 03:21:28 +0000 (15:21 +1200)

Trivial merge