Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  Diabook-dark.  More touchups.
  specified background image does not exist
  diabook-theme: some fixes
  priv mail autocomplete, improved contrast for darkzero, etc.
  email autocomplete
  diabook-theme: some css/bug-fixes

* master:
This commit is contained in:
Simon L'nu 2012-05-10 19:53:11 -04:00
parent e7b8e839ae
commit 9c53a311de

Diff Content Not Available