Merge branch 'master' of git://github.com/cidadania/e-cidadania
commit43ca2fbc3f6683ff1837e942925cabf33a0ac173
authorOscar Carballal Prego <info@oscarcp.com>
Mon, 9 Apr 2012 15:27:02 +0000 (9 17:27 +0200)
committerOscar Carballal Prego <info@oscarcp.com>
Mon, 9 Apr 2012 15:27:02 +0000 (9 17:27 +0200)
tree23e307ffa1dc6ee60c1be9f89e21e0a3871e0b85
parent5580b245ea5d074b5838768b59c76be6772c14d5
parenta88a8ff8b50c0a94db9495fca04a09cd5e51ddff
Merge branch 'master' of git://github.com/cidadania/e-cidadania