Merge branch 'MDL-50801_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 19 Aug 2015 17:14:00 +0000 (19:14 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 19 Aug 2015 17:14:00 +0000 (19:14 +0200)
commit05f97c615c7eceb8d6c1510f564c0b3fbda4464e
tree7c48497b363570d93d32a95e9ae7403b35bc9fb2
parent933183e52ad5ff824aca2544e57b30ba7e39d372
parent556decf159230ec5a0950cb6aeea4b4aae0a8953
Merge branch 'MDL-50801_master' of git://github.com/dmonllao/moodle