From 739d90387097396b4dc8e0efc24f6a1e1bd88c44 Mon Sep 17 00:00:00 2001
From: Simon L'nu <simon.lnu@gmail.com>
Date: Sun, 25 Mar 2012 17:07:43 -0400
Subject: [PATCH] Merge branch 'master', remote-tracking branch
 'remotes/upstream/master'

* remotes/upstream/master:

* master: