Merge branch 'master' into table-nesting

Conflicts:
	dist/css/bootstrap.min.css

1 files changed, 1 insertions, 1 deletions

diff --git a/css.html b/css.html
index c421f2e5c..0188331fb 100644
--- a/css.html
+++ b/css.html
@@ -501,7 +501,7 @@ base_url: "../"
   }
 }
 
-// Generate the large column offsets
+// Generate the medium column offsets
 .make-md-column-offset(@columns) {
   @media (min-width: @screen-medium) {
     margin-left: percentage((@columns / @grid-columns));