[network-manager-applet: 3/3] merge: branch 'lr/vlan-connection-add'

[Lubomir Rintel <lkundrak src gnome org>]

commit e3dc587fde961199f65caf5b5c8fa304c876e84d
Merge: d7a2861 1f06db1
Author: Lubomir Rintel <lkundrak v3 sk>
Date:   Tue Jun 23 16:10:52 2015 +0200

    merge: branch 'lr/vlan-connection-add'
    
    https://bugzilla.gnome.org/show_bug.cgi?id=750597

 src/connection-editor/nm-connection-editor.c |    4 +-
 src/connection-editor/nm-connection-list.c   |    5 ++
 src/connection-editor/page-ip4.c             |    5 +-
 src/connection-editor/page-ip6.c             |    5 +-
 src/connection-editor/page-vlan.c            |   84 ++++++++++++++++++++++++++
 5 files changed, 93 insertions(+), 10 deletions(-)
---