From 452e109f3950d242bd05d22bc8e6f09e629784ca Mon Sep 17 00:00:00 2001
From: Martin Gansser <mgansser@alice.de>
Date: Sun, 4 Jan 2015 13:17:15 +0100
Subject: [PATCH] update to 3.2.0

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

diff --git a/clog b/clog
index 7809fe1..6cda48b 100644
--- a/clog
+++ b/clog
@@ -1,2 +1,2 @@
-<<<<<<< HEAD
+update to 3.2.0