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

* remotes/upstream/master:
  cleanup photo menus
  more backend work on mail2 followers
  make editplain work everywhere
  move all fix_mce to one function so it can easily be undone
  duplicate community posts
  fix_mce_lf contact edit page
  fix_mce_lf on profiles
  set default on get_avatar
  rev update
  Incorrect tranlation (one negation too much)
  fixed install bug
  diabook-themes: smal fix in bbcode-js
  diabook-themes: added url and quote to bbcode toolbar under comment box
  Remove Gravatar from core and add new hook avatar_lookup.
  Rename gravatar_img() more generic to avatar_img().

* master: