Merge branch 'MDL-43000' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 26 Nov 2013 07:05:42 +0000 (15:05 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 26 Nov 2013 07:05:42 +0000 (15:05 +0800)

Trivial merge