Merge branch 'MDL-45579-master' of git://github.com/FMCorz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Jun 2014 18:56:14 +0000 (20:56 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Jun 2014 18:56:14 +0000 (20:56 +0200)
commitffce783fcd24a906f41b9ecc97150b1d15b7ed0b
tree39051cd235d0160364c09a06b107d5a444d8ed96
parented16bf372431ef42aee698202c6d06b18fee5ad0
parent6685e0487f2ac6c9b5648c98fcf01a40f60ddfa9
Merge branch 'MDL-45579-master' of git://github.com/FMCorz/moodle