[network-manager-applet: 5/5] editor: merge branch 'bg/editor-ipv4-addresses-bgo763937'

[Beniamino Galvani <bgalvani src gnome org>]

commit 2b598b5904a7d9fc2b18aef86da278680148213c
Merge: 3095707 35b489a
Author: Beniamino Galvani <bgalvani redhat com>
Date:   Wed Sep 14 23:23:44 2016 +0200

    editor: merge branch 'bg/editor-ipv4-addresses-bgo763937'
    
    https://bugzilla.gnome.org/show_bug.cgi?id=763937

 src/connection-editor/ce-page-ip4.ui |    3 -
 src/connection-editor/ce-page-ip6.ui |    3 -
 src/connection-editor/ce-page.h      |   14 ++++++
 src/connection-editor/page-ip4.c     |   86 ++++++++++++++++++++++++++++++----
 src/connection-editor/page-ip6.c     |   38 ++++++++++++---
 5 files changed, 122 insertions(+), 22 deletions(-)
---