Merge branch 'm26_MDL-46900' of https://github.com/totara/moodle into MOODLE_26_STABLE
commitfa74d00ca607ed565e816ce8905ffbb7fb953ea8
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 25 Aug 2014 18:55:44 +0000 (25 20:55 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 25 Aug 2014 18:55:44 +0000 (25 20:55 +0200)
tree15b1ebc1239bb81f71fa817c64c0b0e2a30aaa01
parent124aa2558a4be20f3a22097c9b3790d3dc734f3c
parentd489ecd1ebaf9183aa47446a5cebb8fb74453dd1
Merge branch 'm26_MDL-46900' of https://github.com/totara/moodle into MOODLE_26_STABLE