[DRE-commits] [SCM] ruby-actionmailer-3.2.git branch, master, updated. debian/3.2.3-1-2-g4e7c84e

[Ondřej Surý]

The following commit has been merged in the master branch:
commit 4e7c84e4aa3264693f8b431efdd0b7569598355e
Author: Ondřej Surý <ondrej at sury.org>
Date:   Wed May 23 13:01:21 2012 +0200

    prepare 3.2.3-2 release

diff --git a/debian/changelog b/debian/changelog
index d446210..17fc047 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ruby-actionmailer-3.2 (3.2.3-2) unstable; urgency=low
+
+  * Add Conflict with ruby-actionmailer-2.3 (Closes: #673740)
+
+ -- Ondřej Surý <ondrej at debian.org>  Wed, 23 May 2012 13:01:17 +0200
+
 ruby-actionmailer-3.2 (3.2.3-1) unstable; urgency=low
 
   * Initial release

-- 
ruby-actionmailer-3.2.git