Merge branch 'MDL-50641-master' of git://github.com/danpoltawski/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 1 Sep 2015 23:53:09 +0000 (01:53 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 1 Sep 2015 23:53:09 +0000 (01:53 +0200)
commit89875d2a8a47836c8950880ba76b37483c04233f
tree3237e77fdb82cc08017928a0eada3d129afc3d08
parent17d2a336d10ddd9ef6008721ec2681ee955e0cc4
parentcd1b845f6243b691b68472f70e6eeff0b7209773
Merge branch 'MDL-50641-master' of git://github.com/danpoltawski/moodle