From: Mark Otto <markdotto@gmail.com>
Date: Sun, 11 Dec 2011 08:58:10 +0000 (-0800)
Subject: Merge branch 'add-vertical-nav-divider' of https://github.com/evnm/bootstrap into... 
X-Git-Tag: v2.0.0~6^2~406
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6de3ed53228c79bc4fde5086d1302f2367bc40a5;p=thirdparty%2Fbootstrap.git

Merge branch 'add-vertical-nav-divider' of https://github.com/evnm/bootstrap into evnm-add-vertical-nav-divider

Conflicts:
	bootstrap.css
---

6de3ed53228c79bc4fde5086d1302f2367bc40a5
diff --cc bootstrap.css
index 5fb8b6fc88,977737f67b..79fe4826cf
--- a/bootstrap.css
+++ b/bootstrap.css
@@@ -6,7 -6,7 +6,7 @@@
   * http://www.apache.org/licenses/LICENSE-2.0
   *
   * Designed and built with all the love in the world @twitter by @mdo and @fat.
-  * Date: Sat Dec 10 22:29:17 PST 2011
 - * Date: Fri Dec  2 11:32:48 PST 2011
++ * Date: Sun Dec 11 00:58:00 PST 2011
   */
  html, body {
    margin: 0;