Added by Kostas Papadimitriou over 9 years ago
Merge branch 'master' into packaging
Conflicts: pithos/__init__.py