From 45254c4fd2bd13f6ddb7cdf0e26f2d35cb4ba8ff Mon Sep 17 00:00:00 2001
From: Will Thompson <will.thompson@collabora.co.uk>
Date: Wed, 17 Aug 2011 16:13:07 +0100
Subject: Version 0.12.6

---
 NEWS         |  7 +++++++
 configure.ac |  4 ++--
 src/main.c   | 21 ---------------------
 3 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/NEWS b/NEWS
index 3c052176a..eeb093f53 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,10 @@
+telepathy-gabble 0.12.6 (2011-08-17)
+====================================
+
+Fixes:
+
+• No pony.
+
 telepathy-gabble 0.12.5 (2011-08-17)
 ====================================
 
diff --git a/configure.ac b/configure.ac
index 8b2bf98e2..e6e6d285d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,8 +9,8 @@ AC_PREREQ([2.59])
 
 m4_define([gabble_major_version], [0])
 m4_define([gabble_minor_version], [12])
-m4_define([gabble_micro_version], [5])
-m4_define([gabble_nano_version], [1])
+m4_define([gabble_micro_version], [6])
+m4_define([gabble_nano_version], [0])
 
 # Some magic
 m4_define([gabble_base_version],
diff --git a/src/main.c b/src/main.c
index 973c8be68..e6fc2288f 100644
--- a/src/main.c
+++ b/src/main.c
@@ -20,27 +20,6 @@
 #include "config.h"
 #include "gabble.h"
 
-#if 0
-           .,,.
-         ,;;*;;;;,
-        .-'``;-');;.
-       /'  .-.  /*;;
-     .'    \d    \;;               .;;;,
-    / o      `    \;    ,__.     ,;*;;;*;,
-    \__, _.__,'   \_.-') __)--.;;;;;*;;;;,
-     `""`;;;\       /-')_) __)  `\' ';;;;;;
-        ;*;;;        -') `)_)  |\ |  ;;;;*;
-        ;;;;|        `---`    O | | ;;*;;;
-        *;*;\|                 O  / ;;;;;*
-       ;;;;;/|    .-------\      / ;*;;;;;
-      ;;;*;/ \    |        '.   (`. ;;;*;;;
-      ;;;;;'. ;   |          )   \ | ;;;;;;
-      ,;*;;;;\/   |.        /   /` | ';;;*;
-       ;;;;;;/    |/       /   /__/   ';;;
-       '*jgs/     |       /    |      ;*;
-            `""""`        `""""`     ;'
-#endif
-
 int
 main (int argc,
       char **argv)
-- 
cgit v1.2.1