Viewing all changes in revision 415.3.11.

Committer: Gavin Panella
Date: 2011-10-28 14:46:12 UTC
mfrom: <a title="Merged From 415.1.39" href="/~ack/storm/resultset-get-query/revision/415.1.39">(415.1.39 oneiric-admin-shutdown-bug-871596)
mto: This revision was merged to the branch mainline in revision 422 .
Revision ID: gavin.panella@canonical.com-20111028144612-jjs3eirjtb9n15c8

Merged oneiric-admin-shutdown-bug-871596 into django-disconnection-errors, resolving conflicts.

added added

removed removed

~ack/storm/resultset-get-query