Merge lp:~lifeless/python-oops-tools/deps into lp:python-oops-tools

[Robert Collins]

Fix another typo in the use of timeline-django, release 0.6.6 to get it out there.

Really seriously fully get timeline-django working.

[Robert Collins (lifeless)]

review: Approve

=== modified file 'buildout-templates/bin/oopstools.wsgi.in'
--- buildout-templates/bin/oopstools.wsgi.in	2012-09-23 00:52:28 +0000
+++ buildout-templates/bin/oopstools.wsgi.in	2012-09-25 06:42:57 +0000
@@ -16,7 +16,7 @@
 application = OOPSWSGIHandler()
 from timeline_django.wsgi import make_app as timeline_django_make_app
 from timeline import wsgi as timeline_wsgi
-pplication = timeline_django_make_app(application)
+application = timeline_django_make_app(application)
 application = timeline_wsgi.make_app(application)
 
 from timeline_django import setup

=== modified file 'src/oopstools/NEWS.txt'
--- src/oopstools/NEWS.txt	2012-09-23 00:52:28 +0000
+++ src/oopstools/NEWS.txt	2012-09-25 06:42:57 +0000
@@ -5,6 +5,14 @@
 NEXT
 ====
 
+0.0.6
+=====
+
+The brown paper bag edition.
+
+* Fix typoes that prevented the new timeline-django code installing or working
+  properly. (Robert Collins)
+
 0.6.5
 =====
 

=== modified file 'src/oopstools/version.txt'
--- src/oopstools/version.txt	2012-09-23 00:52:28 +0000
+++ src/oopstools/version.txt	2012-09-25 06:42:57 +0000
@@ -1,1 +1,1 @@
-0.6.5
+0.6.6