From 3ffde1c1e9f1157f83f7e0bfaf102d2c67388697dc33deea1d7c13e0824ca738 Mon Sep 17 00:00:00 2001
From: Victor Roman Archidona <vroman@loadfront.com>
Date: Mon, 28 Jul 2014 13:48:05 +0200
Subject: [PATCH] Merge branch 'master' of github.com:vroman/edivc