Merge branch 'MDL-50391-master' of git://github.com/aspark21/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 18 Aug 2015 04:09:49 +0000 (12:09 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 19 Aug 2015 16:30:28 +0000 (18:30 +0200)
commitd2999f8085ffdd8c5eaf30ba5ef40a4581935695
treeeccba6896cc8144b667972806b8a096c2542e284
parentedd6e9ebe224fd46e40b457989f407e7df09ca74
parent8b40604ab99da1974e5ece60c46ad2b01a1b65b0
Merge branch 'MDL-50391-master' of git://github.com/aspark21/moodle