Merge branch 'gsoc2012' of git://github.com/cidadania/e-cidadania into gsoc2012
commitdaf46efe518854dbb6f42ab8f619148479fa9936
authorOscar Carballal Prego <info@oscarcp.com>
Mon, 20 Aug 2012 09:23:33 +0000 (20 11:23 +0200)
committerOscar Carballal Prego <info@oscarcp.com>
Mon, 20 Aug 2012 09:23:33 +0000 (20 11:23 +0200)
tree6a9030cc95a93794f225ac079584bb03a0047b02
parentbc3bbfd3ed49c8d71377cde1757f46f512aa1235
parent9c9bc731734344d4e9db878f5989e92d730bc2bb
Merge branch 'gsoc2012' of git://github.com/cidadania/e-cidadania into gsoc2012