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

* remotes/upstream/master:

* master: