Merge branch 'MDL-50781-master' of git://github.com/danpoltawski/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Nov 2015 19:13:21 +0000 (20:13 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Nov 2015 19:13:21 +0000 (20:13 +0100)
commitf509e2e0a25a770d794e8bae17802e78a62889cd
tree7cc11f06ba8509b6d4ef47e06c3f78be920e428d
parentd18a8d716c67b97922434145e3f6470ebb3f7860
parent24c3db91a46018949bfd7f39c33944458b864b0d
Merge branch 'MDL-50781-master' of git://github.com/danpoltawski/moodle