Merge branch 'MDL-42957-26' of https://github.com/jamiepratt/moodle into MOODLE_26_STABLE
commitd6ece9f7f0f931a4427bfbc762e8629fd1297b31
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 28 Nov 2013 11:44:13 +0000 (28 12:44 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 28 Nov 2013 11:44:13 +0000 (28 12:44 +0100)
tree74d9445fdee7563c32a2277019687f3f4781a87c
parent66d40a5daea6c661fc759d79353747448cd078e9
parenta69c78724e6ff09434515802efabbee3e659fc7b
Merge branch 'MDL-42957-26' of https://github.com/jamiepratt/moodle into MOODLE_26_STABLE