Merge branch 'MDL-41235-master' of git://github.com/phalacee/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 10 Sep 2013 06:25:48 +0000 (14:25 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 10 Sep 2013 06:25:48 +0000 (14:25 +0800)

Trivial merge