trying to fix a problem with a custom db_column of a primary key
there is only django-admin.py in virtualenv
tests for a custom PK name
Merge remote-tracking branch 'origin/patch-1'
fix a test showing the bug
fix tree_manager_attr setting the wrong manager on models with a default manager which isnt a treemanager. fixes #184 , thanks @akx
fix broken links in README. fixes #179
Add Norwegian Bokmål translation
FeinCMSModelAdmin compatibility with Django 1.4+ admin images
Django 1.4+: Use STATIC_URL, instead of ADMIN_MEDIA_PREFIX.

See issue #191
Make tox work again.
0.5.3 - improved django 1.4 compatibility and some general bug fixes.
fix bad infinite recursion bug for multi-table inheritance due to a self-referential manager (was a regression in 0.5.3). re #207
Merge branch '0.5.x' of github.com:django-mptt/django-mptt into 0.5.x
add tests for the infinite recursion bug in #207

Conflicts:

	tests/myapp/models.py
	tests/myapp/tests.py
0.5.4 - critical fix for regression in 0.5.3 (infinite recursion in managers for some models, notably affecting django-cms) - see #207
Merge commit '45684c2e8ce1b2a817ef4b99cfe95808dc995ab9' into 0.5.x

Conflicts:
	tests/myapp/models.py
	tests/myapp/tests.py
The official FeinCMS site is now www.feincms.org
Add a minimal unit test for FeinCMSModelAdmin._actions_column().

Conflicts:
	tests/myapp/tests.py
(typo)