Merge branch 'wip-mdl-36958-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_...
authorSam Hemelryk <sam@moodle.com>
Tue, 8 Jan 2013 01:06:36 +0000 (14:06 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 8 Jan 2013 01:06:36 +0000 (14:06 +1300)

Trivial merge