Merge branch 'wip-mdl-31640-new' of git://github.com/rajeshtaneja/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 20 Mar 2012 20:41:32 +0000 (09:41 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 20 Mar 2012 20:41:32 +0000 (09:41 +1300)

Trivial merge