From c1ed662fcc22bd63f45f074d4fa954cf4ecded3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mattias=20Andr=C3=A9e?= <maandree@operamail.com>
Date: Sun, 28 Oct 2012 15:48:16 +0100
Subject: [PATCH] changes in `master`

---
 CHANGELOG               | 5 +++++
 manuals/ponysay.texinfo | 9 ++++++++-
 setup.py                | 2 +-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 48c4c36a..25cfdf15 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -11,6 +11,11 @@ Version 3.0
 	Environment variable 'PONYSAY_WRAP_EXCEED' has been added.
 
 
+Version 2.9.1
+
+	Bug fix: correction in the -W option broke the -o option.
+
+
 Version 2.9
 
 	New ponies: pinkieumbrelahatfear, twilighttime
diff --git a/manuals/ponysay.texinfo b/manuals/ponysay.texinfo
index 333dbb6f..499bb585 100644
--- a/manuals/ponysay.texinfo
+++ b/manuals/ponysay.texinfo
@@ -8,7 +8,7 @@
 @documentlanguage en
 @finalout
 @c %**end of header
-@set VERSION 2.9
+@set VERSION 2.9.1
 
 @defindex op
 @synindex op vr
@@ -2100,6 +2100,13 @@ Environment variable @env{PONYSAY_WRAP_EXCEED} has been added.
 @end itemize
 
 
+@heading Version 2.9.1
+@itemize @bullet
+@item
+Bug fix: correction in the -W option broke the -o option.
+@end itemize
+
+
 @heading Version 2.9
 @itemize @bullet
 @item
diff --git a/setup.py b/setup.py
index 0f255eae..a3be893c 100755
--- a/setup.py
+++ b/setup.py
@@ -8,7 +8,7 @@ from subprocess import Popen, PIPE
 
 
 
-PONYSAY_VERSION = '2.9'
+PONYSAY_VERSION = '2.9.1'