From: Mark Otto Date: Mon, 20 Aug 2012 18:28:43 +0000 (-0700) Subject: Merge branch 'patch-1' of https://github.com/krnlde/bootstrap into krnlde-patch-1 X-Git-Tag: v2.1.0~2^2~5 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ed13ec50f84f78a27b994fef73e9e4acaafecb19;p=thirdparty%2Fbootstrap.git Merge branch 'patch-1' of https://github.com/krnlde/bootstrap into krnlde-patch-1 --- ed13ec50f84f78a27b994fef73e9e4acaafecb19