Merge branch 'MDL-55276-master' of git://github.com/junpataleta/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Aug 2016 23:01:51 +0000 (01:01 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Aug 2016 23:01:51 +0000 (01:01 +0200)
commitf00780105c2cc53d7fc1d0984494f8c4e330d726
treee83f1d4483b092a0aab50d419f2bf99443972cb4
parentbc7817edab21eea8acabd30df3bd14239b5ac8cf
parent7a05bc92c9c7e399ecf9e392d361eccaefccf380
Merge branch 'MDL-55276-master' of git://github.com/junpataleta/moodle