Merge branch 'MDL-55785-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 28 Sep 2016 17:59:20 +0000 (19:59 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 28 Sep 2016 17:59:20 +0000 (19:59 +0200)
commit7bc32ebccd7df8dcfabe2d1396b05b3427bc1733
tree5914ed3419483fa0b7db17c6b9519e91f63e8fe7
parentcf1d2cb0738b4108b917b7b859f5811c5669eee4
parentfad980b26fd7923e2233c466cbcbfc9e37327302
Merge branch 'MDL-55785-master' of git://github.com/jleyva/moodle