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

* remotes/upstream/master:
  string update
  implement contact archival
  archive contact flag
  pass zrl to dfrn_request as fallback
  rev update
  another attempt to fix lower tab behaviour on small screens, community back in tab area

* master: