Merge branch 'MDL-16730-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_S...
authorSam Hemelryk <sam@moodle.com>
Sun, 6 Jan 2013 21:14:54 +0000 (10:14 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 6 Jan 2013 21:14:54 +0000 (10:14 +1300)

Trivial merge