[DRE-commits] [SCM] redmine.git branch, master-experimental, updated. debian/1.4.4+dfsg1-1-5-g7f1f228

[Jérémy Lal]

The following commit has been merged in the master-experimental branch:
commit 0f87f30b76731808d8c3c06ad5408c61eb0dbe53
Merge: 07571dc66d2402e52123faaddfbf55793106d10b af2f169378bfe852cf98085b4be6287f88a8fdac
Author: Jérémy Lal <kapouer at melix.org>
Date:   Thu Jan 19 22:54:00 2012 +0100

    Merge branch 'master' of ssh://git.debian.org/git/pkg-ruby-extras/redmine
    
    Conflicts:
    	debian/changelog

diff --combined debian/changelog
index b3bb26c,3db00d6..91c0987
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,8 +1,14 @@@
 -redmine (1.3.0+dfsg1-2) UNRELEASED; urgency=low
 +redmine (1.3.0+dfsg1-2) unstable; urgency=low
  
++  [ Jérémy Lal ]
 +  * debian/patches/2002_FHS_through_env_vars.patch:
 +    Output pdf in RAILS_CACHE, not in Rails.root/tmp.
 +    (Closes: #656329)
 +
++  [ Paul van Tilburg ]
+   * debian/watch: fixed a small error in the dversionmangle pattern.
+ 
 - -- Paul van Tilburg <paulvt at debian.org>  Thu, 29 Dec 2011 15:12:45 +0100
 + -- Jérémy Lal <kapouer at melix.org>  Thu, 19 Jan 2012 22:42:04 +0100
  
  redmine (1.3.0+dfsg1-1) unstable; urgency=low
  

-- 
redmine.git