]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
authorfat <jacobthornton@gmail.com>
Sat, 17 Aug 2013 21:25:16 +0000 (14:25 -0700)
committerfat <jacobthornton@gmail.com>
Sat, 17 Aug 2013 21:25:16 +0000 (14:25 -0700)

Trivial merge