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

Conflicts:
	bootstrap.css

diff --cc bootstrap.css
index 5fb8b6fc88be7c333fc9787c865881bf69f9bc47,977737f67b3394f3b5241827596569ae9dc1536d..79fe4826cf4a3171a66cc3c58ad5194c51e48e8b
--- 1/bootstrap.css
--- 2/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;

diff --cc bootstrap.min.css
Simple merge

diff --cc docs/components.html
Simple merge

diff --cc lib/patterns.less
Simple merge