Merge branch 'MDL-46753-26' of git://github.com/lameze/moodle into MOODLE_26_STABLE
commitd5ee2634bd0c05c4869eeea613bc935d34ce2d27
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Aug 2014 00:08:35 +0000 (26 02:08 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Aug 2014 00:08:35 +0000 (26 02:08 +0200)
tree19465ca6fee975c82b13f83e2fa56c95bc02c352
parentcc2ef7a5059046f744d309ed307f263f7a7d5cb7
parente3a51bcd2811156e67ce2d1c8f97f36195404ebc
Merge branch 'MDL-46753-26' of git://github.com/lameze/moodle into MOODLE_26_STABLE