From: Chris Lamb <lamby@debian.org>
Date: Tue, 27 Oct 2009 14:25:37 +0000 (+0000)
Subject: Merge branch 'master' into deb-src-3.0-sqla
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=32dc9d52c53207a6524ecf63ac7866435ae40374;p=dak

Merge branch 'master' into deb-src-3.0-sqla

* master:
  Use session.commit_or_flush in some more functions.
  Attach commit_or_flush to session object to call either .commit() or .flush()
  Add doc for session_wrapper.
  process-new: Fix BCC and X-Katie handling
  Fix various small bugs
  Re-enable BXA notifications
  queue: Fix typo
  Convert process_new to new APIs
  Print a warning if a trainee tries to do something he's not allowed to do
  Documentation fixes

Conflicts:
	daklib/queue.py
---

32dc9d52c53207a6524ecf63ac7866435ae40374