Merge branch 'MDL-55804_30' of git://github.com/dmonllao/moodle into MOODLE_30_STABLE
commit895b108ff12764801a155c8fe63bdcbb608fab3c
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 28 Sep 2016 23:14:49 +0000 (29 01:14 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 28 Sep 2016 23:14:49 +0000 (29 01:14 +0200)
tree7fa9456f65b4dcee524c0e42fa7b70578cb62dd6
parent0de90550dc5065567f1095de6c1626bd69035cb6
parent750a1815b1a91f20d479e0af46b2a04e31ba9a0d
Merge branch 'MDL-55804_30' of git://github.com/dmonllao/moodle into MOODLE_30_STABLE