Merge branch 'MDL-30889-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_S...
authorSam Hemelryk <sam@moodle.com>
Mon, 24 Sep 2012 03:05:44 +0000 (15:05 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 24 Sep 2012 03:05:44 +0000 (15:05 +1200)

Trivial merge