From 686fe47b8892d3c3cd82b77b77adf3c990a7c160 Mon Sep 17 00:00:00 2001
From: Simon L'nu <simon.lnu@gmail.com>
Date: Fri, 9 Mar 2012 19:02:29 -0500
Subject: [PATCH] Merge branch 'master', remote-tracking branch
 'remotes/upstream/master'

* remotes/upstream/master:
  add js to hide nav-menus, when clicked outside
  fixes in css
  recover contacts total count which got lost
  bug #324 - tinymce used for mail even if editplain being used.
  bug in check for private email comment to public conversation prevents authenticated visitor from seeing comments that should be allowed
  keep tony from talking to himself

* master: