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
Update the mptt fields in the cached parent when we set the parent field to a new parent
FeinCMSModelAdmin compatibility with Django 1.4+ admin images
Add a minimal unit test for FeinCMSModelAdmin._actions_column().
Django 1.4+: Use STATIC_URL, instead of ADMIN_MEDIA_PREFIX.

See issue #191
Make tox work again.
(typo)
Merge pull request #1 from piet-byteorbit/master

Additions to django-mptt #191 (FeinCMSModelAdmin Django 1.4 compatibility)
Merge pull request #191 from zemanel/master

FeinCMSModelAdmin compatibility with Django 1.4 admin images. Thanks @zemanel and @piet-byteorbit
fix test failure if feincms isnt installed
Merge pull request #181 from dekkers/update-cached-parent

Update the mptt fields in the cached parent when saving existing object. thanks @dekkers
Merge remote-tracking branch 'slafs/master'. Thanks @slafs

Conflicts:
	tests/myapp/tests.py
BACKWARDS INCOMPATIBLE (slightly ;) ): remove implicit empty_label=None in TreeNodeChoiceField and TreeNodeMultipleChoiceField. If you need this behavior, you'll need to pass empty_label=None to the mptt fields yourself.

closes #161
add formfield change to upgrade notes
initial caller-side implementation of MPTTManager.disable_mptt_updates(). Not actually used during updates yet. re #69
BACKWARDS INCOMPATIBLE: require python 2.5+