From 3778d9dc2bfb50a61ffcb9ece37bcf6d9aab09f1 Mon Sep 17 00:00:00 2001
From: Simon Holmberg <holmberg.simon@gmail.com>
Date: Tue, 25 Sep 2012 14:13:01 +0200
Subject: [PATCH] Merge branches 'master' and 'devel'