prueba
Merge branch 'master' of github.com:kurkop/openzix
Merge branch 'master' of github.com:kurkop/openzix
Se cambia a version Django 1.5 Se añade Redis