From 2a3aaca88ded68a8ce926577d3faea2f3ef0ab50 Mon Sep 17 00:00:00 2001
From: Simon L'nu <simon.lnu@gmail.com>
Date: Mon, 5 Mar 2012 23:36:22 -0500
Subject: [PATCH] Merge branch 'master', remote-tracking branch
 'remotes/upstream/master'

* remotes/upstream/master:
  some admin page fixes and cleanup
  changed bg color around comment box from white to match page background, improved contrast on comment preview (darkzero)
  string update
  some testbubble stuff
  can_write_wall documentation

* master: