From: Mark Otto <otto@github.com>
Date: Sat, 30 Mar 2013 19:54:16 +0000 (-0700)
Subject: Merge branch 'pickypg-patch-1' into 3.0.0-wip
X-Git-Tag: v3.0.0-rc1~533
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7c3c5ed7cc07748d33989058d9e7eef11e367c28;p=thirdparty%2Fbootstrap.git

Merge branch 'pickypg-patch-1' into 3.0.0-wip

Conflicts:
	less/dropdowns.less
---

7c3c5ed7cc07748d33989058d9e7eef11e367c28
diff --cc less/dropdowns.less
index 02d4a87baf,e30144527a..601210d7ff
--- a/less/dropdowns.less
+++ b/less/dropdowns.less
@@@ -69,9 -77,9 +69,8 @@@
      padding: 3px 20px;
      clear: both;
      font-weight: normal;
 -    line-height: @baseLineHeight;
 -    color: @dropdownLinkColor;
 -    white-space: normal;
 +    line-height: @line-height-base;
 +    color: @dropdown-link-color;
-     white-space: nowrap;
    }
  }