[Pkg-javascript-commits] [SCM] Mapnik stylesheet compiler branch, master, updated. debian/0.4.6+ds1-3-7-g6d8e102

[Jérémy Lal]

The following commit has been merged in the master branch:
commit 6d8e102847bfd07ca4ff1cc51526880821108b51
Merge: 39f101298457e8a0e8ab0860b579e63cf970be1f 8a80800ca187590a0a3329a534c8f4f7c0d6f854
Author: Jérémy Lal <kapouer at melix.org>
Date:   Sun Jan 27 20:40:15 2013 +0100

    Merge branch 'master' of ssh://git.debian.org/git/collab-maint/node-carto
    
    Conflicts:
    	debian/changelog

diff --combined debian/changelog
index 8643ae7,7d68568..4aac0af
--- a/debian/changelog
+++ b/debian/changelog
@@@ -4,10 -4,11 +4,14 @@@ node-carto (0.4.6+ds1-4) UNRELEASED; ur
    * Change debian/watch to use the github repository for the source of
      upstream releases
  
+   [ David Paleino ]  
+   * Upgraded carto and mml2json code to work with newer versions of
+     nodejs.
+ 
 +  [ Jérémy Lal ]
 +  * Add a manpage for mml2json.js.
 +
-  -- Andrew Harvey <andrew.harvey4 at gmail.com>  Sun, 23 Sep 2012 09:24:42 +1000
+  -- David Paleino <dapal at debian.org>  Sun, 27 Jan 2013 20:28:44 +0100
  
  node-carto (0.4.6+ds1-3) unstable; urgency=low
  

-- 
Mapnik stylesheet compiler