From: Mark Otto <otto@github.com>
Date: Thu, 20 Dec 2012 05:02:54 +0000 (-0800)
Subject: Merge branch 'bs3-input-groups' into 3.0.0-wip
X-Git-Tag: v3.0.0-rc1~836^2~23
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=51b1a027dacfb31f80ddff1755a19530d89d912d;p=thirdparty%2Fbootstrap.git

Merge branch 'bs3-input-groups' into 3.0.0-wip

Conflicts:
	docs/assets/css/bootstrap.css
---

51b1a027dacfb31f80ddff1755a19530d89d912d