Corrigiendo Git conflict.
authorLuis Alejandro Martínez Faneyth <luis@huntingbears.com.ve>
Tue, 27 May 2014 18:17:15 +0000 (13:47 -0430)
committerLuis Alejandro Martínez Faneyth <luis@huntingbears.com.ve>
Tue, 27 May 2014 18:17:15 +0000 (13:47 -0430)
commit51794ee6bf218be66fd0bca7e7a6550b492413da
tree8b0cf8659d6f26ba4b97a2cb3fc2bb950ebde8a8
parenta2e8811077fed2b28d4939cc2ee6fe3365f45acc
Corrigiendo Git conflict.
tribus/config/testing.py