Merge branch 'MDL-35007-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_S...
authorSam Hemelryk <sam@moodle.com>
Mon, 10 Sep 2012 23:07:25 +0000 (11:07 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 10 Sep 2012 23:07:25 +0000 (11:07 +1200)

Trivial merge