Merge branch 'MDL-54553-master' of git://github.com/danpoltawski/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 18 May 2016 16:23:41 +0000 (18:23 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 18 May 2016 16:23:41 +0000 (18:23 +0200)
commita73d64585a891799b20d711585613c81e0247bef
tree999298447c1f18d4e6fefe57e9ce4cbde4f76183
parentc0fe085c24b5558658fb6586c3adf3f9d22af0b5
parent5c602bf5bb1e564ef677fd2f14b0eeef8fba3073
Merge branch 'MDL-54553-master' of git://github.com/danpoltawski/moodle