Merge branch 'wip-mdl-28972' of git://github.com/rajeshtaneja/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 14 Mar 2012 01:40:07 +0000 (14:40 +1300)
committerSam Hemelryk <sam@moodle.com>
Wed, 14 Mar 2012 01:40:07 +0000 (14:40 +1300)

Trivial merge