[DRE-commits] [ruby-fog] 02/04: new upstream fixes file conflict with fog-core

[Praveen Arimbrathodiyil]

This is an automated email from the git hooks/post-receive script.

praveen pushed a commit to branch master
in repository ruby-fog.

commit 9b93a11f33c7a25967293efd3001b00811116bd5
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Sun Apr 20 09:38:57 2014 +0530

    new upstream fixes file conflict with fog-core
---
 debian/changelog | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 525c586..5fe957e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ruby-fog (1.22.0-1) UNRELEASED; urgency=low
+
+  * Team upload.
+  * New upstream release.
+  * Fixes file conflict with fog-core (Closes: #744010)
+
+ -- Pirate Praveen <praveen at debian.org>  Sun, 20 Apr 2014 09:37:37 +0530
+
 ruby-fog (1.19.0-1) unstable; urgency=low
 
   * Team upload

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-fog.git