From: Guus Sliepen <guus@tinc-vpn.org>
Date: Fri, 27 Jul 2012 20:48:24 +0000 (+0200)
Subject: Merge branch 'master' into 1.1
X-Git-Tag: release-1.1pre3~78
X-Git-Url: http://tinc-vpn.org/git/browse?p=tinc;a=commitdiff_plain;h=248d300f1be0d5f2aae39202041699ab2b46c56b

Merge branch 'master' into 1.1
---

248d300f1be0d5f2aae39202041699ab2b46c56b