From: Mark Otto <otto@github.com>
Date: Sun, 4 Nov 2012 20:27:30 +0000 (-0800)
Subject: Merge branch '2.1.2-list-inline' of https://github.com/andriijas/bootstrap into andri... 
X-Git-Tag: v2.2.2~92
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=68f26d959f97c761206bf5f6f808e6199d620ca2;p=thirdparty%2Fbootstrap.git

Merge branch '2.1.2-list-inline' of https://github.com/andriijas/bootstrap into andriijas-2.1.2-list-inline
---

68f26d959f97c761206bf5f6f808e6199d620ca2