]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch 'pr/12579'
authorMark Otto <otto@github.com>
Sat, 8 Feb 2014 23:53:18 +0000 (15:53 -0800)
committerMark Otto <otto@github.com>
Sat, 8 Feb 2014 23:53:18 +0000 (15:53 -0800)

Trivial merge