[tntnet/f18] <<<<<<< HEAD

[Martin Gansser]

commit 7766563e58e0f25bbd6d2474fe8a984ce8e93b2a
Author: Martin Gansser <mgansser at alice.de>
Date:   Fri May 3 21:59:47 2013 +0200

    <<<<<<< HEAD
    
    =======
    - new release
    - spec file cleanup

 clog |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
---
diff --git a/clog b/clog
new file mode 100644
index 0000000..7e0380e
--- /dev/null
+++ b/clog
@@ -0,0 +1,5 @@
+<<<<<<< HEAD
+
+=======
+- new release
+- spec file cleanup