Merge branch 'wip-MDL-42310-26' of git://github.com/abgreeve/moodle into MOODLE_26_STABLE
commit5c283bb71367593e1143dcd5f0d7a3b29b94abe8
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 8 Jan 2014 00:52:12 +0000 (8 01:52 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 8 Jan 2014 00:52:12 +0000 (8 01:52 +0100)
tree750ecfa20ea7ae96044dce2a111817dff958210c
parente86b3c7335f0f8d8a508017a1fce9afdf4cd3074
parent025000a221aa535c9248a8e34401cd2a1936b839
Merge branch 'wip-MDL-42310-26' of git://github.com/abgreeve/moodle into MOODLE_26_STABLE