From c5cb208cb8ac0968bebb416bad5b37b029ccd239 Mon Sep 17 00:00:00 2001
From: Simon L'nu <simon.lnu@gmail.com>
Date: Fri, 30 Mar 2012 08:17:40 -0400
Subject: [PATCH] Merge branch 'master', remote-tracking branch
 'remotes/upstream/master'

* remotes/upstream/master:
  quattro-green: adopted quattro option for centered display
  string update
  add themes diabook-red & diabook-aerith
  rename "file as" to "save to folder"
  bug #352 - qcomment plugin disabled, qcomments still allowed
  quattro-greey: apply theming to private mail
  zrl into people searches
  another silly mistake
  silly mistake
  zrl on mentions
  use zrl to get home again
  provide a way to specify an admin account for siteinfo if more than one have admin email address

* master: