Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip

css.html

@@ -96,7 +96,7 @@ base_url: "../"
 /* Small devices (tablets, 768px and up) */
 @media (min-width: @screen-tablet) { ... }
 
-/* Medium devices (tablets, 992px and up) */
+/* Medium devices (desktops, 992px and up) */
 @media (min-width: @screen-desktop) { ... }
 
 /* Large devices (large desktops, 1200px and up) */