Merge branch 'MDL-52558-master' of git://github.com/sammarshallou/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 22 Dec 2015 03:16:36 +0000 (11:16 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 22 Dec 2015 03:16:36 +0000 (11:16 +0800)
commit39604f212e164e68fb45272d09f6f02d11011724
tree27f6c00a9ca23cffbdc9df3ded9b150e2e83fe69
parentc2df9b3b90e428149f3b824555a537503db86133
parent92cce140ed95d48b725d09af59bde9b537705eb7
Merge branch 'MDL-52558-master' of git://github.com/sammarshallou/moodle