Merge branch 'refs/heads/dom-architecture' into binding

Conflicts:
	css/ninja.css
	scss/imports/scss/_toolbar.scss

Signed-off-by: Armen Kesablyan <armen@motorola.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/node_modules/montage/core/converter/date-converter.js b/node_modules/montage/core/converter/date-converter.js
index f484f7aa..7b062925 100755
--- a/node_modules/montage/core/converter/date-converter.js
+++ b/node_modules/montage/core/converter/date-converter.js
@@ -1582,7 +1582,7 @@ var Montage = require("montage").Montage,
             return function (s) {
                 var rx = _fn.call(this, s);
                 return [
-                    [rx[0][0], r[0][2]],
+                    [rx[0][0], rx[0][2]],
                     rx[1]
                 ];
             };
@@ -1592,7 +1592,7 @@ var Montage = require("montage").Montage,
             c = c || null;
             return (p instanceof Array ?
                 _.each(_.product(p.slice(0, -1), _.ignore(d)), p.slice(-1), _.ignore(c)) :
-                _.each(_.many(_.each(p, _.ignore(d))), px, _.ignore(c)));
+                _.each(_.many(_.each(p, _.ignore(d))), p, _.ignore(c)));
         },
         set: function (px, d, c) {
             d = d || _.rtoken(/^\s*/);