merge: branch 'bg/dhcp-timeout-property-bgo761464'
authorBeniamino Galvani <bgalvani@redhat.com>
Tue, 16 Feb 2016 10:38:12 +0000 (11:38 +0100)
committerBeniamino Galvani <bgalvani@redhat.com>
Tue, 16 Feb 2016 10:38:12 +0000 (11:38 +0100)
https://bugzilla.gnome.org/show_bug.cgi?id=761464


Trivial merge