From: Teemu Hukkanen <tjhukkan@iki.fi>
Date: Wed, 29 Oct 2014 12:31:19 +0000 (+0000)
Subject: Merge branch 'master' of http://shamusworld.gotdns.org/git/virtualjaguar
X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=virtualjaguar;a=commitdiff_plain;h=a739aec450d9e0c1e2684be740b67ebd6cf40add

Merge branch 'master' of shamusworld.gotdns.org/git/virtualjaguar
---

a739aec450d9e0c1e2684be740b67ebd6cf40add