]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge pull request #12297 from Quy/master
authorJulian Thilo <bigj95t@gmail.com>
Sun, 19 Jan 2014 16:15:10 +0000 (08:15 -0800)
committerJulian Thilo <bigj95t@gmail.com>
Sun, 19 Jan 2014 16:15:10 +0000 (08:15 -0800)
Additional changes to #12275 and #12292


Trivial merge