Merge branch 'MDL-40732' of git://github.com/rwijaya/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 27 Aug 2013 07:06:38 +0000 (15:06 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 27 Aug 2013 07:06:38 +0000 (15:06 +0800)

Trivial merge