]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch 'dionysiosarvanitis-master' into 2.1.2-wip
authorMark Otto <markotto@twitter.com>
Fri, 7 Sep 2012 18:41:35 +0000 (11:41 -0700)
committerMark Otto <markotto@twitter.com>
Fri, 7 Sep 2012 18:41:35 +0000 (11:41 -0700)

Trivial merge