Merge branch 'master' into 1903-new-authz-removal

Conflicts:
	ckan/lib/create_test_data.py
	ckan/logic/action/create.py
	ckan/logic/action/get.py
	ckan/model/user.py
	ckan/tests/legacy/logic/test_action.py
	ckan/tests/legacy/models/test_user.py

.coveragerc

@@ -1,3 +1,3 @@
 [run]
-omit = */migration/*, /tests/*, */new_tests/*
+omit = */migration/*, /tests/*
 source = ckan, ckanext

MANIFEST.in

@@ -12,6 +12,7 @@ recursive-include ckanext/*/public *
 recursive-include ckanext/*/templates *
 recursive-include ckanext/*/theme/public *
 recursive-include ckanext/*/theme/templates *
+include ckanext/datastore/set_permissions.sql
 
 prune .git
 include CHANGELOG.txt

ckan/__init__.py

@@ -1,18 +1,18 @@
-__version__ = '2.3a'
+__version__ = '2.4a'
 
 __description__ = 'CKAN Software'
 __long_description__ = \
-'''CKAN software provides a hub for datasets. The flagship site running CKAN 
+'''CKAN software provides a hub for datasets. The flagship site running CKAN
 is theDataHub.org but it is also used for dozens of other open data websites
 run by governments, agencies and citizens.
 
-CKAN provides a place to search for open knowledge resources as well as 
-register your own - be that a set of Shakespeare's works, a global 
-population density database, the voting records of MPs, or 30 years of 
+CKAN provides a place to search for open knowledge resources as well as
+register your own - be that a set of Shakespeare's works, a global
+population density database, the voting records of MPs, or 30 years of
 US patents.
 
 Those familiar with Freshmeat or CPAN can think of CKAN as providing an
-analogous service for open data and knowledge. 
+analogous service for open data and knowledge.
 '''
 __license__ = 'AGPL'