Merge branch 'MDL-35889-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_S...
authorSam Hemelryk <sam@moodle.com>
Tue, 30 Oct 2012 02:48:49 +0000 (15:48 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 30 Oct 2012 02:48:49 +0000 (15:48 +1300)

Trivial merge