Merge branch 'MDL-35926_alt_c' of git://github.com/rwijaya/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 7 Oct 2013 19:27:46 +0000 (08:27 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 7 Oct 2013 19:27:46 +0000 (08:27 +1300)

Trivial merge