From e9e29500bbf75f26927cbd39c2f67512fdc430de Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Thu, 11 Dec 2014 13:10:02 +0100
Subject: [PATCH] fix extended merge problems

---
 storage | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/storage b/storage
index c6103e59c..bcc2874cf 160000
--- a/storage
+++ b/storage
@@ -1 +1 @@
-Subproject commit c6103e59c0938b173c0e08a852ff1cbbc4e284e3
+Subproject commit bcc2874cf289a1d0fc9cc79ff3ed271403b2e24c