]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch 'example-fix' of https://github.com/Boulox/bootstrap into Boulox-example-fix
authorMark Otto <otto@github.com>
Tue, 2 Apr 2013 21:49:42 +0000 (14:49 -0700)
committerMark Otto <otto@github.com>
Tue, 2 Apr 2013 21:49:42 +0000 (14:49 -0700)

Trivial merge