Merge branch 'm26_MDL-47054' of git://github.com/totara/moodle into MOODLE_26_STABLE
commitaf9405732af27ebe8e4b3445abb1111f3a258ebc
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Sep 2014 00:19:58 +0000 (9 02:19 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Sep 2014 00:19:58 +0000 (9 02:19 +0200)
tree60492aaaae10acbf4c420fab52d4d316533f55f8
parent1dd2ce2ecc5ddb8ad7740d0aafd2932e01b8d345
parent1890b9e000b4e7133421f391d9c833ce224bb3f9
Merge branch 'm26_MDL-47054' of git://github.com/totara/moodle into MOODLE_26_STABLE