Change get_inline_instances signature to match then change made in Django 1.5.
Merge branch 'master' of https://github.com/onespacemedia/cms