[SCM] Debian packaging of libmojomojo-perl branch, master, updated. debian/1.05+dfsg-2-6-gd024a82

[Florian Schlichting]

The following commit has been merged in the master branch:
commit d024a82a884f936a48bf0d8388d799ca114941f7
Merge: dec34f5db3df3a3cb02bf0be8f0ba03b0f7140ae 5c66e26c4214c6c004f95e13f372c173f08847a0
Author: Florian Schlichting <fschlich at zedat.fu-berlin.de>
Date:   Tue Aug 7 20:45:27 2012 +0200

    Merge branch 'rcbug'
    
    Conflicts:
    	debian/changelog
    	debian/control

diff --combined debian/changelog
index e680957,42156dd..cd3116b
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,10 +1,16 @@@
- libmojomojo-perl (1.05+dfsg-3) UNRELEASED; urgency=low
++libmojomojo-perl (1.05+dfsg-4) UNRELEASED; urgency=low
 +
-   [ gregor herrmann ]
 +  * debian/control: update {versioned,alternative} (build) dependencies.
 +
-   [ Florian Schlichting ]
++ -- gregor herrmann <gregoa at debian.org>  Thu, 05 Jul 2012 12:41:29 -0600
++
+ libmojomojo-perl (1.05+dfsg-3) unstable; urgency=low
+ 
+   * Team upload.
    * Fix FTBFS caused by updated Catalyst::Plugins::SubRequest.
      Closes: #680796
  
-  -- gregor herrmann <gregoa at debian.org>  Thu, 05 Jul 2012 12:41:29 -0600
+  -- Florian Schlichting <fschlich at zedat.fu-berlin.de>  Tue, 07 Aug 2012 20:35:24 +0200
  
  libmojomojo-perl (1.05+dfsg-2) unstable; urgency=low
  

-- 
Debian packaging of libmojomojo-perl