[network-manager-pptp: 12/12] service: merge branch 'th/logging-bgo771664'

[Thomas Haller <thaller src gnome org>]

commit c6aaa03baf29e450048ff5a6941d6443ef4428dc
Merge: 4334f03 cb9a073
Author: Thomas Haller <thaller redhat com>
Date:   Tue Sep 20 12:05:12 2016 +0200

    service: merge branch 'th/logging-bgo771664'
    
    https://bugzilla.gnome.org/show_bug.cgi?id=771664

 po/POTFILES.in                         |    1 +
 shared/Makefile.am                     |    3 +
 shared/nm-utils/nm-glib.h              |   63 ++++++++-
 shared/nm-utils/nm-macros-internal.h   |  115 +++++++++++++++
 shared/nm-utils/nm-shared-utils.c      |  239 ++++++++++++++++++++++++++++++++
 shared/nm-utils/nm-shared-utils.h      |   66 +++++++++
 shared/nm-utils/nm-vpn-plugin-macros.h |   93 ++++++++++++
 src/Makefile.am                        |   41 ++++--
 src/nm-pptp-pppd-plugin.c              |  129 ++++++++++-------
 src/nm-pptp-service.c                  |  132 ++++++++++++------
 10 files changed, 770 insertions(+), 112 deletions(-)
---