Merge branch 'wip-mdl-41413-int' of git://github.com/rajeshtaneja/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 3 Sep 2013 07:16:42 +0000 (15:16 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 3 Sep 2013 07:16:42 +0000 (15:16 +0800)

Trivial merge