[DebianGIS-dev] [SCM] josm-plugins branch, master, updated. debian/0.0.svn22363-1-37-gb3d3d09

[David Paleino]

The following commit has been merged in the master branch:
commit 44005c607f46d8d48a8d828e02505a8f321e9d0c
Merge: 604fb92917eb541f16eab309f6d2e203e5b93c34 e0c33cd7af8c5b517c5bc2541731368c30817b62
Author: David Paleino <dapal at debian.org>
Date:   Sun Oct 10 22:01:16 2010 +0200

    Merge branch 'master' into dh7
    
    Conflicts:
    	debian/changelog

diff --combined debian/changelog
index dc87bbd,6a99760..770dcae
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,10 +1,13 @@@
- josm-plugins (0.0.svn23040-2) UNRELEASED; urgency=low
+ josm-plugins (0.0.svn23479-1) UNRELEASED; urgency=low
  
+   * New upstream snapshot
    * debian/control:
      - added two new packages: webkit-image-qt and webkit-image-gtk
 +    - bump debhelper dependency to >= 8~
 +  * debian/rules rewritten to use dh7
 +  * debian/compat bumped to 8
  
-  -- David Paleino <dapal at debian.org>  Sun, 10 Oct 2010 21:48:51 +0200
+  -- David Paleino <dapal at debian.org>  Sun, 10 Oct 2010 22:00:30 +0200
  
  josm-plugins (0.0.svn23040-1) unstable; urgency=low
  

-- 
Plugins for josm