Merge branch 'MDL-41621' of git://github.com/rwijaya/moodle
authorMarina Glancy <marina@moodle.com>
Mon, 16 Sep 2013 07:14:18 +0000 (17:14 +1000)
committerMarina Glancy <marina@moodle.com>
Mon, 16 Sep 2013 07:14:18 +0000 (17:14 +1000)

Trivial merge