From be50cc03b8b997a3b073c3627f371bd16b82eaa5 Mon Sep 17 00:00:00 2001
From: Simon L'nu <simon.lnu@gmail.com>
Date: Tue, 20 Mar 2012 21:41:34 -0400
Subject: [PATCH] Merge branch 'master', remote-tracking branch
 'remotes/upstream/master'

* remotes/upstream/master:
  move friend suggestions to top of contact page, add default contact profile photos if missing
  missed a default profile photo replacement in notifications
  change default profile photo to something more interesting than a reddish brown square
  slightly relax overly strict permissions in community and search to match those in display - tl;dr public conversations are publicly visible

* master: