]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch 'patch-1' of https://github.com/sirlantis/bootstrap into sirlantis-patch-1
authorMark Otto <markotto@twitter.com>
Fri, 23 Mar 2012 07:28:25 +0000 (00:28 -0700)
committerMark Otto <markotto@twitter.com>
Fri, 23 Mar 2012 07:28:25 +0000 (00:28 -0700)

Trivial merge