From b90ddebe1d1cb49c30c3a9d99119e3b0d14995fd Mon Sep 17 00:00:00 2001
From: Daniel Baumann <mail@daniel-baumann.ch>
Date: Wed, 18 May 2016 20:28:46 +0200
Subject: Merging upstream version 20160515.

Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
---
 VERSION.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'VERSION.txt')

diff --git a/VERSION.txt b/VERSION.txt
index 3eb848a..232669c 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-20160501
+20160515
-- 
cgit v1.2.3