Merge branch 'master_MDL-42473' of git://github.com/danmarsden/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 20 Jan 2016 00:29:28 +0000 (01:29 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 20 Jan 2016 00:29:28 +0000 (01:29 +0100)
commitbb66ff558183324f0945a5c447b42ef92e1760c9
tree9f5faf7c2f602368068eb3f9498aeea653690bdd
parent4b2326faad25ce22d1d508faee3a907022902eb5
parented383edb364a32b7822f9cd49dad0706a7e9ad55
Merge branch 'master_MDL-42473' of git://github.com/danmarsden/moodle