From d90c830332899629a6016f1767bb7dff7d0d56a9 Mon Sep 17 00:00:00 2001
From: Simon L'nu <simon.lnu@gmail.com>
Date: Wed, 7 Mar 2012 22:30:46 -0500
Subject: [PATCH] Merge branch 'master', remote-tracking branch
 'remotes/upstream/master'

* remotes/upstream/master:
  still getting parent relays on remote systems
  revup

* master: