[network-manager-openconnect: 22/22] Merge stable branch 'nm-1-2' into master

[dwmw2 <dwmw2 src gnome org>]

commit a3e43fc501e950e2fd0fa03c35bd9cf253337354
Merge: 172b0a6 b8eff58
Author: David Woodhouse <David Woodhouse intel com>
Date:   Mon Jul 4 16:46:20 2016 +0100

    Merge stable branch 'nm-1-2' into master
    
    Keep master and nm-1-2 together again for now.
    
    See https://mail.gnome.org/archives/networkmanager-list/2016-May/msg00085.html

 NEWS           |   10 ++++++++++
 configure.ac   |    2 +-
 po/POTFILES.in |    2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)
---
diff --cc configure.ac
index c31e124,bc0df22..dd432f6
--- a/configure.ac
+++ b/configure.ac
@@@ -1,10 -1,10 +1,10 @@@
  AC_PREREQ(2.52)
  
  AC_INIT(NetworkManager-openconnect,
-         1.3.0,
+         1.2.3,
          https://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager,
          NetworkManager-openconnect)
 -AM_INIT_AUTOMAKE([subdir-objects no-dist-gzip dist-xz])
 +AM_INIT_AUTOMAKE([no-dist-gzip dist-xz])
  AM_MAINTAINER_MODE
  
  AC_CONFIG_MACRO_DIR([m4])
diff --cc po/POTFILES.in
index f645d26,86a8a62..3c5a519
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@@ -4,9 -4,6 +4,9 @@@ appdata/network-manager-openconnect.met
  auth-dialog/main.c
  openconnect-strings.txt
  properties/auth-helpers.c
 -properties/nm-openconnect.c
 +properties/nm-openconnect-editor-plugin.c
 +properties/nm-openconnect-editor.c
- src/nm-openconnect-service.c
 +shared/nm-utils/nm-shared-utils.c
 +shared/nm-utils/nm-vpn-plugin-utils.c
+ src/nm-openconnect-service.c
  [type: gettext/glade]properties/nm-openconnect-dialog.ui