12 avril : travail sur build agregate from source
12 avril  c2
15 avril
commit dev 15 avril
commit 2_15/04
Merge branch 'lolo_test' into dev
Merge branch 'dev' of https://github.com/openfisca/openfisca into dev
RMI+RSA in aggregates data from sources
rmi+rsa2
commit 15/04/16h34
job 15/04 16h39
Merge branch 'job_15_04' into dev

Conflicts:
	src/plugins/survey/aggregates.py
amounts.h5 15/04/17h00
drop DATA_DIR2
Merge pull request #158 from bouvard/dev

Dev
Minor typo
Merge branch 'dev' of https://github.com/openfisca/openfisca into dev

Conflicts:
	src/scripts/aggregates_all_years.py