]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch 'master' of https://github.com/jarijokinen/bootstrap into jarijokinen...
authorMark Otto <markdotto@gmail.com>
Sun, 5 Feb 2012 10:33:30 +0000 (02:33 -0800)
committerMark Otto <markdotto@gmail.com>
Sun, 5 Feb 2012 10:33:30 +0000 (02:33 -0800)

Trivial merge