]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch 'master' of github.com:twbs/bootstrap
authorMark Otto <otto@github.com>
Sat, 14 Dec 2013 21:23:25 +0000 (13:23 -0800)
committerMark Otto <otto@github.com>
Sat, 14 Dec 2013 21:23:25 +0000 (13:23 -0800)

Trivial merge