Merge branch 'MDL-47107-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Sep 2014 00:15:26 +0000 (02:15 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Sep 2014 00:15:26 +0000 (02:15 +0200)
commita02aef0c7c649451e252587d48e79049bf8ef596
tree21a59cf72bafbaa0f44059e82e6e585466da15b3
parent559f6d6d1b2281d17f6da7de9e6deba2c748a5fa
parent4238983e2a1693220945b6684a35d15c73e30be0
Merge branch 'MDL-47107-master' of git://github.com/andrewnicols/moodle