Merge branch 'master' of github.com:twbs/bootstrap

diff --cc getting-started.html
Simple merge

diff --cc less/grid.less
index ef6f1ebda9207c37e67113ade438b4a45403a2f9,4cab7e38675e1d89af49de79d530e5ccd0d5c7a1..100d51fa224d8c1060f0fdb08fdd5cb36a5575e5
--- 1/less/grid.less
--- 2/less/grid.less
+++ b/less/grid.less
@@@ -269,12 -269,12 +269,12 @@@
  //
  // Columns, offsets, pushes, and pulls for the large desktop device range.
  //
- // Note that `.col-lg-12` doesn't get floated on purpose—there's no need since
+ // Note that `.col-lg-12` doesn't get floated on purpose--there's no need since
  // it's full-width.
  
 -@media (min-width: @screen-lg-desktop) {
 +@media (min-width: @screen-lg-min) {
    .container {
 -    max-width: @container-lg-desktop;
 +    max-width: @container-lg;
    }
  
    .col-lg-1,