Merge branch 'MDL-43394a' of https://github.com/srynot4sale/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 7 Jan 2014 02:59:40 +0000 (10:59 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 7 Jan 2014 02:59:40 +0000 (10:59 +0800)

Trivial merge