Merge branch 'MDL-40687' of git://github.com/rwijaya/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 10 Sep 2013 21:47:41 +0000 (09:47 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 10 Sep 2013 21:47:41 +0000 (09:47 +1200)

Trivial merge