From: Mark Otto <otto@github.com>
Date: Sun, 2 Dec 2012 09:32:13 +0000 (-0800)
Subject: Merge branch 'Moveo-master' into 2.2.2-wip
X-Git-Tag: v2.2.2~33
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=85c57c6ba895d39bad648903f8a085d336d256ea;p=thirdparty%2Fbootstrap.git

Merge branch 'Moveo-master' into 2.2.2-wip
---

85c57c6ba895d39bad648903f8a085d336d256ea