merge: make VPN timeout configurable - vpn.timeout property (bgo #754754)
authorJiří Klimeš <jklimes@redhat.com>
Mon, 21 Sep 2015 14:59:46 +0000 (16:59 +0200)
committerJiří Klimeš <jklimes@redhat.com>
Mon, 21 Sep 2015 14:59:46 +0000 (16:59 +0200)
https://bugzilla.gnome.org/show_bug.cgi?id=754754


Trivial merge