From: Mark Otto Date: Wed, 5 Sep 2012 17:04:38 +0000 (-0700) Subject: Merge branch 'spantaleev-patch-1' into 2.1.2-wip X-Git-Tag: v2.2.0^2~123 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3fa4ca2d871ba402f19f9c1d5e358baa023061a8;p=thirdparty%2Fbootstrap.git Merge branch 'spantaleev-patch-1' into 2.1.2-wip --- 3fa4ca2d871ba402f19f9c1d5e358baa023061a8