Merge branch 'MDL-47943-master' of https://github.com/dthies/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 6 Nov 2014 17:44:38 +0000 (18:44 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 6 Nov 2014 17:44:38 +0000 (18:44 +0100)
commit415fc3d2f9603a170f427173f30ecaf508f9bbd1
tree7be564ed30f6abb87c5c234684c0643039f26f21
parented34ab47e1ea2a69d8582ec290182f3d96d4812a
parent8160d004ce7609f4c500ebb29eb9e5f7b54dfe96
Merge branch 'MDL-47943-master' of https://github.com/dthies/moodle