correction erreur
ras
Merge branch 'dev' of https://github.com/openfisca/openfisca into dev
Fix datatable and ongoing work on plus values
legislation cotsoc 2012
Merge pull request #215 from bouvard/dev

Dev
Adding plus-values immo. Fixing some 2012 parameters
Hack to run France 2012
Improving capital taxation in france
Merge pull request #219 from benjello/dev

Improving capital taxation frace/cecilia
Merge branch 'dev' of https://github.com/openfisca/openfisca into dev
Because of unfound error, started conversion of 04_famille from scratch.

The file has now implemented function to monitor the state of the data frame famille.