From 4eeeba3d6ddf8c8619ff9f72529df745eac981a8 Mon Sep 17 00:00:00 2001
From: Vladimir Alaev <scff@yandex-team.ru>
Date: Wed, 7 Nov 2012 19:41:43 +0200
Subject: [PATCH 1/2] Magic nodes doesn't link the nodes it creates with parent
 magic nodes (reference #306)

---
 lib/nodes/bundle.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/nodes/bundle.js b/lib/nodes/bundle.js
index 0b099dd7..ff20d33d 100644
--- a/lib/nodes/bundle.js
+++ b/lib/nodes/bundle.js
@@ -10,6 +10,7 @@ var Q = require('q'),
     BemBuildNode = require('./build'),
     BemDeclNode = require('./decl'),
     BorschikNode = require('./borschik'),
+    MagicNode = require('./magic'),
 
     registry = require('../nodesregistry'),
     LOGGER = require('../logger'),
@@ -47,7 +48,9 @@ registry.decl(BundleNodeName, BlockNode, /** @lends BundleNode.prototype */ {
                     root: this.root,
                     path: this.path
                 });
-                arch.setNode(bundleNode, arch.getParents(this));
+                arch.setNode(bundleNode, arch.getParents(this).filter(function(p) {
+                    return !(arch.getNode(p) instanceof MagicNode.MagicNode);
+                }), this);
             }
 
             // generate targets for page files

From af7ee5ee6688347336d2ef7cbb1c4c62b18e53fd Mon Sep 17 00:00:00 2001
From: Vladimir Alaev <scff@yandex-team.ru>
Date: Wed, 6 Mar 2013 14:24:33 +0200
Subject: [PATCH 2/2] 0.5.26

---
 ChangeLog.md        | 4 ++++
 npm-shrinkwrap.json | 2 +-
 package.json        | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ChangeLog.md b/ChangeLog.md
index dcc46ea1..cf01bfb7 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,5 +1,9 @@
 bem-tools changelog
 ===================
+06.03.2013, Version 0.5.26 (stable)
+- bem make: Magic nodes doesn't link the nodes it creates with parent magic nodes (Closes #306)
+- deps.js: don't swallow parsing errors (Closes #353)
+
 14.02.2013, Version 0.5.25 (stable)
 -----------------------------------
 
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 35883265..1420956e 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "bem",
-  "version": "0.5.25",
+  "version": "0.5.26",
   "dependencies": {
     "coa": {
       "version": "0.3.9"
diff --git a/package.json b/package.json
index aba5ad66..a2c86c58 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "bem",
   "description": "BEM Tools",
-  "version": "0.5.25",
+  "version": "0.5.26",
   "homepage": "http://github.com/bem/bem-tools",
   "author": "Sergey Berezhnoy <veged@mail.ru> (http://github.com/veged)",
   "maintainers": [