Merge branch 'wip-MDL-43828-m25' of git://github.com/marinaglancy/moodle into MOODLE_...
commit85f47a3ebd92e767700ddd2121551b2390630fa5
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Feb 2014 22:58:22 +0000 (3 23:58 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Feb 2014 22:58:22 +0000 (3 23:58 +0100)
tree054d8afb495e5bb81e692b1290ed484b52ee7060
parent8aaf8591f1e834f50ac9229bddbac1bb351ea398
parent992da86444e510cb152f4b27c41cc732c67e8b71
Merge branch 'wip-MDL-43828-m25' of git://github.com/marinaglancy/moodle into MOODLE_25_STABLE