Merge branch 'MDL-46078-master' of git://github.com/damyon/moodle
commit5d60665bef0d9485f908f4c1dc6c179351267444
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Aug 2015 22:59:42 +0000 (19 00:59 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 19 Aug 2015 16:30:36 +0000 (19 18:30 +0200)
treeaa2a4001447cedca28affc52ecd5197900b18539
parent4f0c8f307a9e21733ba83c76f3471f49713c4800
parent5ce0f749a6601469c854ac4a37cce541fed1e4d9
Merge branch 'MDL-46078-master' of git://github.com/damyon/moodle