From: Mark Otto <otto@github.com>
Date: Tue, 23 Apr 2013 05:58:33 +0000 (-0700)
Subject: Merge branch 'ntwb-editorconfig' into 3.0.0-wip
X-Git-Tag: v3.0.0-rc1~411
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=73793637d1df450e9c8d07cf3760ba4eea2314a9;p=thirdparty%2Fbootstrap.git

Merge branch 'ntwb-editorconfig' into 3.0.0-wip
---

73793637d1df450e9c8d07cf3760ba4eea2314a9