Merge branch 'm28_MDL-46197' of https://github.com/totara/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Jul 2014 13:54:52 +0000 (15:54 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Jul 2014 14:25:23 +0000 (16:25 +0200)
commit39b803cf568f3e9ed0c48f741842a97806eb9926
treeda404069cbe585d4002b6e90ecf47f680be64b28
parent388debc7c5cf757745d54908f7577a2f8c3bdec2
parent186f2f47ddd352f345fb6fa998a4cf335d2cbfae
Merge branch 'm28_MDL-46197' of https://github.com/totara/moodle