Merge branch 'm26_MDL-46875' of https://github.com/totara/moodle into MOODLE_26_STABLE
commit60f1480cdcac38b675a0186e193a86cf8857d03f
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 27 Aug 2014 00:08:26 +0000 (27 02:08 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 27 Aug 2014 00:08:26 +0000 (27 02:08 +0200)
treece463b8a9688a71116d50029cb4a84c468c68de1
parent8e2d62e5e2c4012153e8d62bb8953fc48f02ffc4
parent8d42b3ceb52d232ad8413c189259450df4d64385
Merge branch 'm26_MDL-46875' of https://github.com/totara/moodle into MOODLE_26_STABLE