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

* remotes/upstream/master:
  some reported warnings cleaned up
  network permission ids
  wrong var for notify total
  fix notification total
  improved rw notifications
  bug #349 - email notls setting
  add a searchbox to "find friends" for global search
  bugfix in diabook
  title not updated when editing post
  New parameter in html2plain for plain text exports. More compatibility in API
  API: added max_id
  API: Now threading seems to work
  API: Seesmic is now working. Optimizing text export.
  Quotes with author are now having an "open/close" link
  New bbcode element: "spoiler". Mail: Top post quotes are now embraced in "spoiler" elements

* master: