Merge branch 'MDL-51925-master' of git://github.com/jleyva/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 1 Dec 2015 09:47:36 +0000 (09:47 +0000)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 3 Dec 2015 10:11:03 +0000 (11:11 +0100)
commitc20577b9f2aedb0fdc86f517541e9c743ca88de0
tree01276cdd600efd1d06b7107955580c33836181d2
parent00419a7a0b53984128ba1ecc4141dcb06266b9b6
parent4bc38ba96a30b8821cd86a49376dcd6ae379879a
Merge branch 'MDL-51925-master' of git://github.com/jleyva/moodle