Public Git Hosting - e_cidadania.git/commit

commit	7589aa531862feea97f2fa3205475db0dba6754b
author	Oscar Carballal Prego <info@oscarcp.com>
	Thu, 25 Apr 2013 09:40:14 +0000 (25 11:40 +0200)
committer	Oscar Carballal Prego <info@oscarcp.com>
	Thu, 25 Apr 2013 09:40:14 +0000 (25 11:40 +0200)
tree	9667c840f77571a110a433c098aee43b2f1ac44f	tree \| snapshot (tar.gz zip)
parent	927250eb4b405644f35dbcc6ca53e62b264fddf4	commit \| diff
parent	9c896eb8ea5fbd5f77f790d1ca594ffb4288eac7	commit \| diff

Merge branch 'master' into guardian

Conflicts:
src/apps/ecidadania/voting/admin.py

e-cidadania is an open source based project to give citizens a way to be heared by their representatives.

src/apps/ecidadania/news/models.py	diff1 \|	diff2 \|	blob \| history
src/apps/ecidadania/proposals/models.py	diff1 \|	diff2 \|	blob \| history
src/apps/ecidadania/voting/admin.py	diff1 \|	diff2 \|	blob \| history
src/apps/ecidadania/voting/models.py	diff1 \|	diff2 \|	blob \| history
src/core/spaces/views/spaces.py	diff1 \|	diff2 \|	blob \| history
src/e_cidadania/settings/development.py	diff1 \|	diff2 \|	blob \| history