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

[David Paleino]

The following commit has been merged in the master branch:
commit 8a80800ca187590a0a3329a534c8f4f7c0d6f854
Merge: f97439bc45012d2601d1ac195976e38cdd0a81e8 38af09b6568192bcf4967cf51ec3dd2a97397391
Author: David Paleino <dapal at debian.org>
Date:   Sun Jan 27 20:37:05 2013 +0100

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

diff --combined debian/changelog
index d905f86,0443f29..7d68568
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,14 @@@
  node-carto (0.4.6+ds1-4) UNRELEASED; urgency=low
  
++  [ Andrew Harvey ]
+   * Change debian/watch to use the github repository for the source of
+     upstream releases
+ 
 - -- Andrew Harvey <andrew.harvey4 at gmail.com>  Sun, 23 Sep 2012 09:24:42 +1000
++  [ David Paleino ]  
 +  * Upgraded carto and mml2json code to work with newer versions of
 +    nodejs.
 +
 + -- 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