Merge branch 'MDL-43770-master' of https://github.com/lucisgit/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 24 Mar 2015 00:38:15 +0000 (01:38 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 24 Mar 2015 00:38:15 +0000 (01:38 +0100)
commit20e955a18ea2d40d00040040fad90c61d31bee8b
treee8acf33dc04b4761755e418f188e27c92c765d54
parente448df5ec99fcc665aca52207d2cde09c478c4dd
parent74cc07bedfe29b31d7bf75f3dcfbeb50a21ef9a0
Merge branch 'MDL-43770-master' of https://github.com/lucisgit/moodle