From: Mark Otto <otto@github.com>
Date: Thu, 15 Aug 2013 23:38:12 +0000 (-0700)
Subject: Merge branch 'bs-ex' into bs3_restore_examples
X-Git-Tag: v3.0.0~81^2~11^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=54670ab64a2565fd35071eb17fc7eef3480eb724;p=thirdparty%2Fbootstrap.git

Merge branch 'bs-ex' into bs3_restore_examples

Conflicts:
	.editorconfig
	.gitignore
---

54670ab64a2565fd35071eb17fc7eef3480eb724