From: Shamus Hammons <jlhamm@acm.org>
Date: Mon, 6 Oct 2014 13:20:35 +0000 (-0500)
Subject: Merge remote-tracking branch 'partycle/platform_detect'
X-Git-Tag: 2.1.1~6
X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=virtualjaguar;a=commitdiff_plain;h=cfee3ca4b91ce7056d4f8b2cafa56628ae6b568d

Merge remote-tracking branch 'partycle/platform_detect'
---

cfee3ca4b91ce7056d4f8b2cafa56628ae6b568d