Merge branch 'MDL-45808-master' of git://github.com/FMCorz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Jun 2014 20:47:54 +0000 (22:47 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Jun 2014 20:47:54 +0000 (22:47 +0200)
commita834119d81f86cf69e056bfa6c13c54bc7a2b62c
tree7cd42cd199caa3b0f3a478f24d263fa00b45c9d5
parentffce783fcd24a906f41b9ecc97150b1d15b7ed0b
parent9d4762c9b5a417580477dbf223beb060059e846c
Merge branch 'MDL-45808-master' of git://github.com/FMCorz/moodle