Merge branch 'MDL-48050-master' of git://github.com/damyon/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Nov 2014 23:01:01 +0000 (00:01 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Nov 2014 23:01:26 +0000 (00:01 +0100)
commit862b76f39bc402f20f0d1ad6fa2023d047cc3433
tree8065806075a5895c8187c779d901d012a5f40ddc
parent12a312ac6acb085999c32cd607312587bea7158b
parent12938e894def41616aff785ddde3727039e872c1
Merge branch 'MDL-48050-master' of git://github.com/damyon/moodle