[Pkg-javascript-commits] [acorn] 05/05: Merge the bugfix branch

[Julien Puydt]

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

jpuydt-guest pushed a commit to branch master
in repository acorn.

commit 1ad84160734f63ca505400a8ddfcb41f1eb3d199
Merge: 3253997 b7d4247
Author: Julien Puydt <julien.puydt at laposte.net>
Date:   Thu Mar 9 07:24:03 2017 +0100

    Merge the bugfix branch

 debian/changelog | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index 14f03f9,808b037..acbb3c0
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,8 +1,14 @@@
 +acorn (4.0.11-1) unstable; urgency=medium
 +
 +  * New upstream release.
-   * Add a rule to force compilation ordering. (Closes: #850506)
 +
-  -- Julien Puydt <julien.puydt at laposte.net>  Wed, 08 Mar 2017 10:28:49 +0100
++ -- Julien Puydt <julien.puydt at laposte.net>  Thu, 09 Mar 2017 07:20:13 +0100
++
+ acorn (4.0.4-2) unstable; urgency=medium
+ 
+   * Add explicit rule to force compilation ordering (Closes: #850506)
+ 
+  -- Julien Puydt <julien.puydt at laposte.net>  Thu, 09 Mar 2017 07:17:56 +0100
  
  acorn (4.0.4-1) unstable; urgency=medium
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/acorn.git