From: Mark Otto <markotto@twitter.com>
Date: Sun, 19 Feb 2012 23:01:25 +0000 (-0800)
Subject: Merge branch 'gridcontainer' of https://github.com/jacobrask/bootstrap into jacobrask... 
X-Git-Tag: v2.0.2~142
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=89ccbdf8d1a5dc1b9e4da19a910a5108e4b7988b;p=thirdparty%2Fbootstrap.git

Merge branch 'gridcontainer' of https://github.com/jacobrask/bootstrap into jacobrask-gridcontainer

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

89ccbdf8d1a5dc1b9e4da19a910a5108e4b7988b
diff --cc docs/assets/bootstrap.zip
index 549d70fe20,d1b9b51e0b..cdbb2c88e7
Binary files differ