From e709642f6f9e9e89cd95177b2867794b3183a43b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bjarki=20=C3=81g=C3=BAst=20Gu=C3=B0mundsson?=
 <suprdewd@gmail.com>
Date: Thu, 26 Jul 2012 17:50:56 +0000
Subject: [PATCH] Merge branch 'master', remote-tracking branch 'rr/master'