Merge branch 'MDL-49006' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 9 Feb 2015 18:32:40 +0000 (19:32 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 9 Feb 2015 18:32:40 +0000 (19:32 +0100)
commite7b63ac7885e86a0c7dc32628de601752d5faa83
tree73bbd76230ed8675d76ada3436a384e8c72b4fe6
parentbd308dd09f4c2bd2adf04f1768675852601568b5
parenta6099a7a13b86454cfb2851eed3a44ba8f0181a3
Merge branch 'MDL-49006' of git://github.com/timhunt/moodle