From: Jacob <jacobthornton@gmail.com>
Date: Fri, 27 Dec 2013 02:18:09 +0000 (-0800)
Subject: Merge pull request #11496 from satazor/patch-1
X-Git-Tag: v3.1.0~136^2~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bf3c525d0578c03a946af18c871f9690e7a72ec7;p=thirdparty%2Fbootstrap.git

Merge pull request #11496 from satazor/patch-1

Clear timeout on destroy.
---

bf3c525d0578c03a946af18c871f9690e7a72ec7