Fix Entry.get_absolute_url in the example
FeinCMS v1.6.6

The tarball-was-broken release.
FeinCMS v1.7.4

The tarball-was-broken release.
Merge branch 'master' into next

* master:
  FeinCMS v1.6.6

Conflicts:
	feincms/__init__.py
Look, it's 2013

Thanks, Marc Tamlyn.

Refs 493e2ea62c9ee24b8440cc029d7a9c7d94d6e9f9.
Merge branch 'master' into next

* master:
  Look, it's 2013
Merge remote-tracking branch 'official/master'

* official/master:
  FeinCMS v1.6.6
Merge branch 'master' into next

* master:
Merge branch 'next' of github.com:mjl/feincms into next
Merge branch 'next' into tabbed_options