Merge branch 'MDL-44149-26' of git://github.com/damyon/moodle into MOODLE_26_STABLE
commit4bdc10db61ade081ea428baaff872d75121d47a5
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 4 Aug 2014 15:11:55 +0000 (4 17:11 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 4 Aug 2014 15:11:55 +0000 (4 17:11 +0200)
tree7232bba649babc82a5b33e8edc3f4b42f895c0fe
parent3000cb1ee213d9b8f15420e183facf3f698afd53
parent5d839b02c2195b47b24f6e77a6652fbb8ae947fe
Merge branch 'MDL-44149-26' of git://github.com/damyon/moodle into MOODLE_26_STABLE