Merge branch 'master' of git://github.com/cidadania/e-cidadania
commitb5cf8e12e8c832ac212793c6961b89f4742108db
authorOscar Carballal Prego <info@oscarcp.com>
Mon, 18 Feb 2013 09:46:33 +0000 (18 10:46 +0100)
committerOscar Carballal Prego <info@oscarcp.com>
Mon, 18 Feb 2013 09:46:33 +0000 (18 10:46 +0100)
treee5b33e8943ef1382523334ef03abeb045a9f2dfb
parent14862b4db7ea38dbf564caf355a06572e8040732
parentb9d197357a008f9869151f3c8077921dc0256ad5
Merge branch 'master' of git://github.com/cidadania/e-cidadania