Merge branch 'MDL-41131_c' of git://github.com/rwijaya/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 14 Oct 2013 07:46:22 +0000 (15:46 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 14 Oct 2013 07:46:22 +0000 (15:46 +0800)

Trivial merge