Merge branch 'MDL-42476' of https://github.com/srynot4sale/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 5 Nov 2013 03:24:02 +0000 (11:24 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 5 Nov 2013 03:24:02 +0000 (11:24 +0800)

Trivial merge