Merge branch '43822-26' of git://github.com/samhemelryk/moodle into MOODLE_26_STABLE
commit0f678757a4087c8fbd22b0eb004b29d0c3cec20b
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Feb 2014 01:06:19 +0000 (18 02:06 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Feb 2014 01:06:19 +0000 (18 02:06 +0100)
treeac3299c42c3ffb19545179426b88aa32a2542b5e
parent590a9dc30a91fba5b3959171f2667589352e52eb
parent19cb367592bcabcf0ede35a584565d0d3c19a605
Merge branch '43822-26' of git://github.com/samhemelryk/moodle into MOODLE_26_STABLE