Merge branch 'MDL-42407-master' of git://github.com/phalacee/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 29 Oct 2013 07:08:13 +0000 (15:08 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 29 Oct 2013 07:08:13 +0000 (15:08 +0800)

Trivial merge