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

* remotes/upstream/master:
  I'll leave the private mail recipient autocomplete partially done. Need a good UI/JS person to finish it off.
  mail autcomplete testing
  email recip autocomplete
  rev update
  diabook-theme: small fix
  diabook-theme: add "Earth Layers"-box at right_side
  diabook-theme: twitterbox-bugfix
  diabook: small fix
  diabook-theme: bugfix

* master: