Merge branch 'master' of ssh://apples.lambdacomplex.org/git/disclosr
Merge branch 'master' of ssh://apples.lambdacomplex.org/git/disclosr

Conflicts:
alaveteli/exportAgencies.csv.php

Former-commit-id: 30930bbaff9de93bfab5b75069e3425f05ff5c5e