From: Mark Otto <otto@github.com>
Date: Sat, 27 Jul 2013 03:43:22 +0000 (-0700)
Subject: Merge branch 'example-named-files'
X-Git-Tag: v3.0.0~81^2~11^2~1^2~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c3e662641135b9fadeff589682e85eb4ace4bce6;p=thirdparty%2Fbootstrap.git

Merge branch 'example-named-files'

Conflicts:
	.gitignore
---

c3e662641135b9fadeff589682e85eb4ace4bce6
diff --cc .gitignore
index 218ceb9f33,8c843cb4af..b6f967d807
--- a/.gitignore
+++ b/.gitignore
@@@ -39,4 -34,4 +35,3 @@@ nbprojec
  .CVS
  .idea
  node_modules
--dist