Merge branch 'MDL-49203-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 2 Apr 2015 11:19:35 +0000 (13:19 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 2 Apr 2015 11:19:35 +0000 (13:19 +0200)
commit0a2224b961f773fe036bde2ba5bff469c37ada20
tree2f3f6694d4446111b3771d321b09a55bd300b014
parent1d3fd63f97de06d447f76591055b716436718df5
parente7f4cf2ab7b10f75cd9427908390f59031f368e7
Merge branch 'MDL-49203-master' of git://github.com/jleyva/moodle