Merge branch 'MDL-43687' of https://github.com/mkassaei/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Feb 2014 23:16:48 +0000 (00:16 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Feb 2014 23:16:48 +0000 (00:16 +0100)
commit2c4e0686390077463021b014c4a3b70747cf8891
tree0d800fbdfa2fcd6ae7d78402bdf1f02987f4ab6a
parent21fe8c33559c7b439fdadea4d687aa622c6510e4
parent725847027619c9afe79783418c7b77ad7d522aeb
Merge branch 'MDL-43687' of https://github.com/mkassaei/moodle