Merge branch 'm26_MDL-46197' of https://github.com/totara/moodle into MOODLE_26_STABLE
commit674ce27e1baf367a0c59e10bdd1c38bbc1254588
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Jul 2014 14:14:05 +0000 (14 16:14 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Jul 2014 14:25:18 +0000 (14 16:25 +0200)
tree89e7e5cd737f5862fb4f0454628b664ebbe65258
parent8bbc71406dda18f5c48917cb23c2a26591e1fabd
parent4c2f38ace1ebaef045eb99537f9c6230e149e577
Merge branch 'm26_MDL-46197' of https://github.com/totara/moodle into MOODLE_26_STABLE