Merge branch 'master' into gsoc2012v0.1.5-beta3
commitf04a1b5845bbab0095704aabbb529da27f32e2f6
authorOscar Carballal Prego <info@oscarcp.com>
Thu, 3 May 2012 16:46:26 +0000 (3 18:46 +0200)
committerOscar Carballal Prego <info@oscarcp.com>
Thu, 3 May 2012 16:46:26 +0000 (3 18:46 +0200)
treebc185182995748dbf5838d5784ec9b9fdcb2bb16
parent87ed9a632526f3ee0e066558ae17d5a9e1b006c6
parent9286975a97dd81e0f03763a6ae773f80ae45461d
Merge branch 'master' into gsoc2012
src/e_cidadania/settings.py.old
src/e_cidadania/urls.py