Merge branch 'MDL-45132-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE
commit1e1acdfa778ab749ed3016ea77056354b0b73777
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 16 Apr 2014 17:09:58 +0000 (16 19:09 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 16 Apr 2014 17:09:58 +0000 (16 19:09 +0200)
tree588104c20deac18e4b8f97f5b102f883a114e899
parent65b84ebe7d4b382e6cd174cec2a650164b0dbbac
parent40cf8f62b95af09faf5422e73fdc92afc0e819a6
Merge branch 'MDL-45132-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE