From b0037aeb42d38913e298b396e68b1f73b2983694 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexis=20M=C3=A9taireau?= <alexis@notmyidea.org>
Date: Wed, 30 Jan 2013 19:42:42 +0100
Subject: [PATCH] Merge branches 'patch-1' and 'master' of
 github.com:jrconlin/notmyidea