Merge branch 'wip-mdl-35780-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_...
authorSam Hemelryk <sam@moodle.com>
Sun, 13 Jan 2013 21:59:23 +0000 (10:59 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 13 Jan 2013 21:59:23 +0000 (10:59 +1300)

Trivial merge