]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge remote-tracking branch 'upstream/3.0.0-wip' into 3.0.0-wip 9036/head
authorElvis Ratzlaff <eratzlaff@adelantos.com.py>
Sat, 3 Aug 2013 08:52:09 +0000 (04:52 -0400)
committerElvis Ratzlaff <eratzlaff@adelantos.com.py>
Sat, 3 Aug 2013 08:52:09 +0000 (04:52 -0400)

Trivial merge