Merge branch 'MDL-44871-master' of git://github.com/damyon/moodle
commit0272001830d1adac1e75d13eeff8f21d3674e780
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 12 Jun 2014 09:38:10 +0000 (12 11:38 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 12 Jun 2014 09:38:10 +0000 (12 11:38 +0200)
tree775ec9012826f678460854732a754a8c7ad96c53
parent1a32e1d446443d6477d5ceb43051a899e59084ad
parentd27c8d924acf4439fa9e01ff11da6e6106b777d2
Merge branch 'MDL-44871-master' of git://github.com/damyon/moodle