Merge branch 'wip-mdl-36238-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_...
authorSam Hemelryk <sam@moodle.com>
Tue, 27 Nov 2012 22:41:35 +0000 (11:41 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 27 Nov 2012 22:41:35 +0000 (11:41 +1300)

Trivial merge