From f23e8f8d41f9fba23b0e65f9bf9fae1342ffc4d4 Mon Sep 17 00:00:00 2001
From: redmatrix <redmatrix@redmatrix.me>
Date: Sun, 20 Dec 2015 14:55:43 -0800
Subject: merge hell

---
 version.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'version.inc')

diff --git a/version.inc b/version.inc
index 4887ba16b..75d1e127a 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2015-12-18.1250
+2015-12-20.1252
-- 
cgit v1.2.3