Merge branch 'wip-MDL-43828-m26' of git://github.com/marinaglancy/moodle into MOODLE_...
commite28eb21659ce6c484e1ee4c5d89ff5908cae91ef
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Feb 2014 22:58:14 +0000 (3 23:58 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Feb 2014 22:58:14 +0000 (3 23:58 +0100)
tree6a200d347070f876d2ba4465f6fbd1ea6ae311a5
parent5dce0f2a1aaefca6ff68f15637591af9eab694bd
parentcfd46e76c65563cd1ffa4e4c9f9f3a886750a813
Merge branch 'wip-MDL-43828-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE