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

* remotes/upstream/master:
  ability to only expire contacts, not self
  Provide backend option to only expire other peoples' conversations.
  more theme cleanup
  rev update

* master: