From 014e832db0ab9455adc400e892b7c8a5e2092948 Mon Sep 17 00:00:00 2001
From: Simon L'nu <simon.lnu@gmail.com>
Date: Fri, 27 Apr 2012 04:15:27 -0400
Subject: [PATCH] Merge branch 'master', remote-tracking branch
 'remotes/upstream/master'

* remotes/upstream/master:
  fix view contacts

* master: