From c0a18bc2fad021db026141b732b3e9a1e0ce1d71 Mon Sep 17 00:00:00 2001
From: Simon L'nu <simon.lnu@gmail.com>
Date: Wed, 4 Apr 2012 22:58:32 -0400
Subject: [PATCH] Merge branch 'master', remote-tracking branch
 'remotes/upstream/master'

* remotes/upstream/master:
  well that was a stupid mistake...
  string update
  bug: diaspora_enabled setting turns it on but doesn't fully turn it off.
  better handling of reshares containing embeds

* master: