Merge branch 'MDL-35934' of git://github.com/rwijaya/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 12 Aug 2013 20:33:12 +0000 (08:33 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 12 Aug 2013 20:33:12 +0000 (08:33 +1200)

Trivial merge