Modifying bareme in trannoy and adding some params
Merge pull request #293 from benjello/dev

Modifying bareme in trannoy and adding some params
a annuler
Revert "a annuler"

This reverts commit d2cb2252bf87ec148a50a062399973e9ab7b7dbb.
Revert "Revert "a annuler""

This reverts commit efb1c50d033f64f0443fbb8d3176b26b42ca9c56.
Revert "Revert "Revert "a annuler"""

This reverts commit d5763c801d0ce0344d10af58ef634fda1b012f67.
Starting to fix recap
Merge pull request #295 from benjello/dev

Starting to fix recap
ras
Merge branch 'dev' of https://github.com/openfisca/openfisca into dev

Conflicts:
	src/scripts/victor/recap.py
Fixes #294
Merge pull request #296 from benjello/dev

Fixes #294
Merge branch 'dev' of https://github.com/openfisca/openfisca into dev

Conflicts:
	src/scripts/victor/recap.py
revert
Revert "revert"

This reverts commit 2f337bec1ba0621ae26926f5851245fca7a769f1.
ok
Fixing recap
Merge pull request #297 from benjello/dev

Fixing recap
Merge branch 'dev' of https://github.com/openfisca/openfisca into dev
Fixing unit in erfs aggregates