perform a new merge from master, resolve conflicts

2013-01-03 10:43:03 -05:00
parent 0e3a022086
commit 7229a9cdaf
90 changed files with 3529 additions and 491 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "common/test/phantom-jasmine"]
-	path = common/test/phantom-jasmine
-	url = https://github.com/jcarver989/phantom-jasmine.git