Merge branch 'mdl-53133-master' of git://github.com/deraadt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Mar 2016 22:52:19 +0000 (23:52 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Mar 2016 22:52:19 +0000 (23:52 +0100)
commit1d57167f1568350cfb36ba996a2faf7ad4921885
tree5e7244eec3b8fdfdd7bf42353f9c20005664e3a2
parent4539892cda288e501a250263d71695da09f1cd39
parentb2b4f7c4853d1e38e3f6248a98a66afc4b801f48
Merge branch 'mdl-53133-master' of git://github.com/deraadt/moodle