Merge branch 'MDL-49536-master' of git://github.com/ryanwyllie/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 31 Aug 2015 18:48:18 +0000 (20:48 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 31 Aug 2015 18:48:18 +0000 (20:48 +0200)
commit07db0bbd8f9722f5277f3fed07cbaa0a59292e86
tree408c1f8b952ba7164903891151ae44091223d22f
parent315918f187faf931a0a337d76991dd33919bb708
parent6ceea3fe1284f62e910456852d3d711996cb68d2
Merge branch 'MDL-49536-master' of git://github.com/ryanwyllie/moodle