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/common/static/sass/bourbon/css3/_box-sizing.scss
+++ b/common/static/sass/bourbon/css3/_box-sizing.scss
@@ -2,5 +2,5 @@
 //  content-box | border-box | inherit
  -webkit-box-sizing: $box;
     -moz-box-sizing: $box;
-          box-sizing: $box;
+          box-sizing: $box; *behavior: url(/static/scripts/boxsizing.htc)
 }