Merge branch 'MDL-49205' of git://github.com/timhunt/moodle
commitb062cd5cb11a6eac8a9d70ffdbbb134188758978
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Feb 2015 21:11:57 +0000 (17 22:11 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Feb 2015 21:11:57 +0000 (17 22:11 +0100)
treea63fe34bf44c5c32a3c0855eba2c50233e929f3c
parent8bd49ae9ad2474dd82f5773aacdcae399c7c8c28
parentf0edd9d8f6d939237e5556641bd6a1db2580ff05
Merge branch 'MDL-49205' of git://github.com/timhunt/moodle