Merge branch 'MDL-48795' of https://github.com/apsdehal/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 24 Mar 2015 14:44:37 +0000 (15:44 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 24 Mar 2015 14:44:37 +0000 (15:44 +0100)
commit891b28ff40589b4184838379751c259db28e7808
tree86662f6b536afc28d13aa67be0c5338939de6e02
parent23137001c5a477b9fad140054381b7f48216c9bc
parent83cdfd9a7b709aba446ec9024601830d970e0140
Merge branch 'MDL-48795' of https://github.com/apsdehal/moodle