From 4583221f1c292f2af8cd61958606277712e7b898 Mon Sep 17 00:00:00 2001
From: Jakob Miland <saebekassebil@gmail.com>
Date: Sat, 12 May 2012 15:00:43 +0200
Subject: [PATCH] Merge branch 'master', remote-tracking branch 'origin/master'