[xs] Helpful SOLR hint.
Merge branch 'master' of ssh://github.com/okfn/ckan
Fix minor bug that caused create_users to not commit changes.
Improve logging in useful places.
Comment required, else Toby would just delete the method out of hand.
[#1038] Correct copyright sign for UTF8 file and cut/paste error.
[#1038] Fix to allow sqlite testing - for until the tests are overhaulled.
[#1038] Test fixtures for organization hierarchy.
[#1038] Model methods for organization hierarchy.
[#1038] Test data is now organizations rather than groups.
[#1038] Docs for Member and its capacities is most handy. Explained the sort ordering for some of the group functions.
Merge branch 'master' of github.com:datagovuk/ckan

Conflicts:
	ckan/lib/base.py
	ckan/lib/search/__init__.py
	doc/solr-setup.rst
Merge branch 'master' of github.com:okfn/ckan
Merge branch 'master' into 1038-organization-hierarchy
[#1038] Permission cascading code with tests.
[#1038] Fix permission checking for organizations. Corrected bad test.
[#1038] Fix unreliable ordering of upward CTE.
Merge branch 'master' of github.com:okfn/ckan into 1038-organization-hierarchy
[#1218] Ignore __extras on package_show extras
[#1038] Fix up authz config error and deleted groups
* Fix - CONFIG_PERMISSIONS were not read properly following my prev changes
* Fix deleted child groups being visible.
* Fix up a couple of tests