Merge branch 'MDL-53795-master' of git://github.com/merrill-oakland/moodle
commit8ac2e53d1728e6e697d27ba430de78bc59ac9e01
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 18 Apr 2016 23:44:46 +0000 (19 01:44 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 18 Apr 2016 23:44:46 +0000 (19 01:44 +0200)
tree1c3c51bc92ca784603c38613039beaf4d85578f4
parentfbc6c487366b84687dd9a42b8dc057cb039bfb45
parente214f22f3931d44676e9b7f6ab9c17b292bfdfc8
Merge branch 'MDL-53795-master' of git://github.com/merrill-oakland/moodle