Merge branch 'wip-mdl-30062' of git://github.com/rajeshtaneja/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 5 Feb 2013 07:53:21 +0000 (15:53 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 5 Feb 2013 07:53:21 +0000 (15:53 +0800)

Trivial merge