Merge branch 'refs/heads/master' into binding

Conflicts:
	node_modules/montage/ui/application.js

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

1 files changed, 0 insertions, 24 deletions

diff --git a/node_modules/montage/data/ldapaccess/ldapselectorevaluator.js b/node_modules/montage/data/ldapaccess/ldapselectorevaluator.js
deleted file mode 100755
index a14bee2e..00000000
--- a/node_modules/montage/data/ldapaccess/ldapselectorevaluator.js
+++ /dev/null
@@ -1,24 +0,0 @@
-/* <copyright>
-This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
-No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
-(c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
-</copyright> */
-/**
-        @module montage/data/ldapaccess/ldapselectorevaluator
-    @requires montage/core/core
-    @requires montage/data/selector
-    @requires montage/core/logger
-*/
-var Montage = require("montage").Montage;
-var SelectorEvaluator = require("data/selector").SelectorEvaluator;
-var Selector = require("data/selector").Selector;
-var logger = require("core/logger").logger("ldapselectorevaluator");
-/**
-    @class module:montage/data/ldapaccess/ldapselectorevaluator.LdapSelectorEvaluator
-    @extends module:montage/data/selector.SelectorEvaluator
-*/
-var LdapSelectorEvaluator = exports.LdapSelectorEvaluator = Montage.create(SelectorEvaluator,/** @lends module:montage/data/ldapaccess/ldapselectorevaluator.LdapSelectorEvaluator# */ {
-
-
-});
-Selector.registry.registerEvaluator(LdapSelectorEvaluator);