Merge branch 'MDL-50107-master' of git://github.com/jleyva/moodle
commit51a09cb43ef6b425f74f70fd3e2113516ff4cf69
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 16 Jun 2015 22:16:18 +0000 (17 00:16 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 18 Jun 2015 05:13:40 +0000 (18 07:13 +0200)
tree1ad6f47953ba244f75a9eacb9363f3a1d482bb59
parentbceaa941c8db6918fb2b4cf3d88369fd193f8e20
parentd421a41979a64108f403137c29a46e61f98a3004
Merge branch 'MDL-50107-master' of git://github.com/jleyva/moodle