Merge branch 'MDL-45418_26' of git://github.com/stronk7/moodle into MOODLE_26_STABLE
commite7bc2568a6a4919065ca04c3c83fd0549e60f84b
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Jun 2014 18:13:58 +0000 (10 20:13 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Jun 2014 18:13:58 +0000 (10 20:13 +0200)
tree87a00a34b30ca37914e5bcb2f018063c2a339f36
parent272878cab9df03a6e551f8e706918255a68d1d28
parent9fca4525dcd7390e8aa22745065c9826ff26f7e3
Merge branch 'MDL-45418_26' of git://github.com/stronk7/moodle into MOODLE_26_STABLE