Merge branch 'MDL-41565-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 10 Sep 2013 07:21:49 +0000 (15:21 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 10 Sep 2013 07:21:49 +0000 (15:21 +0800)

Trivial merge