From: Mark Otto <markd.otto@gmail.com>
Date: Mon, 28 May 2012 08:00:23 +0000 (-0700)
Subject: Merge pull request #3619 from coreyti/2.0.4-wip-fix-placeholder
X-Git-Tag: v2.0.4~1^2~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=241cbd478dcacdbd0ddedaecb147bfc9b8f7e753;p=thirdparty%2Fbootstrap.git

Merge pull request #3619 from coreyti/2.0.4-wip-fix-placeholder

2.0.4 wip fix placeholder
---

241cbd478dcacdbd0ddedaecb147bfc9b8f7e753