amercader c1b0415cb6 Merge branch 'release-v2.0' into 2.0-dataset-sources ... Conflicts: ckanext/harvest/model/__init__.py		2012-12-13 18:33:59 +00:00
..
__init__.py	Merge branch 'release-v2.0' into 2.0-dataset-sources	2012-12-13 18:33:59 +00:00