From 94d4cad701ab6b618afb288c88165c0ec17ae238 Mon Sep 17 00:00:00 2001
From: Simon L'nu <simon.lnu@gmail.com>
Date: Tue, 6 Mar 2012 18:15:45 -0500
Subject: [PATCH] Merge branch 'master', remote-tracking branch
 'remotes/upstream/master'

* remotes/upstream/master:
  string update
  [PRIVACY] privacy issue bug #314

* master: