Merge branch 'MDL-50250-master' of git://github.com/lameze/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 10 Jun 2015 22:32:11 +0000 (00:32 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 10 Jun 2015 22:32:11 +0000 (00:32 +0200)
commitb2521cfa457f936140c6ef3c7b00d8aabbf7ab91
treee3d9f24302c3070199215fc4e363f4a787a1a7f8
parent05df4bc5f955a4096b1babfff6fbb1196fc9b065
parent88661686aa794395db1b0f0bb4b67e61a5340fd5
Merge branch 'MDL-50250-master' of git://github.com/lameze/moodle