]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch 'master' of github.com:twbs/bootstrap
authorfat <jacobthornton@gmail.com>
Tue, 24 Dec 2013 21:43:47 +0000 (13:43 -0800)
committerfat <jacobthornton@gmail.com>
Tue, 24 Dec 2013 21:43:47 +0000 (13:43 -0800)

Trivial merge