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

diff --cc daklib/dbconn.py
Simple merge

diff --cc daklib/queue.py
Simple merge