Merge branch '45209-26' of git://github.com/samhemelryk/moodle into MOODLE_26_STABLE
commit5d4923ffccce2fb90004d186c7d5a56b304b6745
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 1 Jul 2014 21:43:28 +0000 (1 23:43 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 1 Jul 2014 21:43:28 +0000 (1 23:43 +0200)
tree263817e60bcdfa27259f211119ec814bf50a58b0
parent2ce17661e8307e31ec6bbc6fbce85003b42a5b47
parentdc9363a6517bda0c0d73fe19f575b6c42b809493
Merge branch '45209-26' of git://github.com/samhemelryk/moodle into MOODLE_26_STABLE