Merge branch 'master' into pentool

Conflicts:
	js/helper-classes/3D/view-utils.js

1 files changed, 0 insertions, 9 deletions

diff --git a/node_modules/montage/test/ui/youtube-player-test/youtube-player-test.js b/node_modules/montage/test/ui/youtube-player-test/youtube-player-test.js
deleted file mode 100755
index 8319fc93..00000000
--- a/node_modules/montage/test/ui/youtube-player-test/youtube-player-test.js
+++ /dev/null
@@ -1,9 +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> */
-var Montage = require("montage").Montage,
-    YoutubePlayer = require("montage/ui/youtube-player").YoutubePlayer;
-
-var YoutubePlayerTest = exports.YoutubePlayerTest = Montage.create(Montage, {});