From 9120a47f091b6e2d0f5bb48914443b6dbd6c417d Mon Sep 17 00:00:00 2001
From: Rudolf Polzer <divverent@xonotic.org>
Date: Fri, 4 Oct 2013 13:03:20 +0200
Subject: [PATCH] Oops. Why wasn't merge-base updated...

---
 .tx/merge-base | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.tx/merge-base b/.tx/merge-base
index 1defbff27..fa97f6f95 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Fri Sep 13 21:26:35 CEST 2013
+Fri Oct  4 13:03:13 CEST 2013
-- 
2.39.2