From: Elvis Ratzlaff <eratzlaff@adelantos.com.py>
Date: Sat, 3 Aug 2013 08:52:09 +0000 (-0400)
Subject: Merge remote-tracking branch 'upstream/3.0.0-wip' into 3.0.0-wip
X-Git-Tag: v3.0.0-rc.2~138^2~7^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e06b6ba7bafcd1391b8b592b9cabeeab17669f22;p=thirdparty%2Fbootstrap.git

Merge remote-tracking branch 'upstream/3.0.0-wip' into 3.0.0-wip
---

e06b6ba7bafcd1391b8b592b9cabeeab17669f22