From f48de791813a914d7ce2e1ec00ba041657f3f8ac Mon Sep 17 00:00:00 2001
From: Simon L'nu <simon.lnu@gmail.com>
Date: Sat, 19 May 2012 18:53:57 -0400
Subject: [PATCH] Merge branch 'master', remote-tracking branch
 'remotes/upstream/master'

* remotes/upstream/master:
  Darkzero, another missing part of "everything"
  Diabook-dark - some more cleaning up
  Okay, so maybe not *everything*
  Give Darkzero some loving.
  backend support for 'x' deliveries per process - x is configurable, more importantly any search starting with # is automatically a tag search. TODO: Need to extend this to people searches starting with @
  sql script to ccnvert all tables to innodb

* master: