Merge branch 'MDL-43760-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 21 Jan 2014 06:28:50 +0000 (14:28 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 21 Jan 2014 06:28:50 +0000 (14:28 +0800)

Trivial merge