Merge branch 'wip-mdl-36125' of git://github.com/rajeshtaneja/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 26 Mar 2013 02:04:31 +0000 (10:04 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 26 Mar 2013 02:04:31 +0000 (10:04 +0800)

Trivial merge