merge
authorSteve Hackbarth <stephenhackbarth@gmail.com>
Fri, 26 Jul 2013 21:03:23 +0000 (17:03 -0400)
committerSteve Hackbarth <stephenhackbarth@gmail.com>
Fri, 26 Jul 2013 21:03:23 +0000 (17:03 -0400)
1  2 
enyo-client/application/source/views/workspace.js
lib/enyo-x/source/views/navigator.js

Simple merge