Merge branch 'MDL-55315-master' of https://github.com/mrmark/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Aug 2016 15:07:16 +0000 (17:07 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Aug 2016 15:07:16 +0000 (17:07 +0200)
commit8a78cb42dadefd3c713c8d8a8555575bfbbb7731
tree5965ce7f16731558224953a82d827e758b7e1353
parent2460f3be57b4a2711d1fc16525b2b0ccb3566df4
parent3077ae600427874b7548796cc1eb170bf2b495aa
Merge branch 'MDL-55315-master' of https://github.com/mrmark/moodle