From e56af0e09e0852c7215546d6f9db32ce5cc21b39 Mon Sep 17 00:00:00 2001
From: Simon L'nu <simon.lnu@gmail.com>
Date: Tue, 22 May 2012 19:49:03 -0400
Subject: [PATCH] Merge branch 'master', remote-tracking branch
 'remotes/upstream/master'

* remotes/upstream/master:
  Oops - but lets commit the right revision, sorry.  There's a spare line in the last one.
  Fix darkzero/ns BB icon background colours.
  cause of bogus wall-to-wall posts found
  add queue totals to admin summary page
  DE: update to the strings and some mail templates
  fix setting array values to config items
  redir links for permission controlled attachments

* master: