[network-manager-iodine: 12/14] Merge branch 'nm-1.1'

[Guido Günther <guidog src gnome org>]

commit d9619973de807f74da4fd595b7719385a6dcfc93
Merge: 4064e8b 04ba0f1
Author: Guido Günther <agx sigxcpu org>
Date:   Sun Mar 13 13:07:47 2016 +0100

    Merge branch 'nm-1.1'

 Makefile.am               |   11 ++-
 auth-dialog/Makefile.am   |    8 +-
 auth-dialog/main.c        |   12 +-
 configure.ac              |   27 ++++--
 nm-iodine-service.name.in |    3 +
 properties/Makefile.am    |   43 +++++++--
 properties/nm-iodine.c    |  227 +++++++++++++++++++++------------------------
 properties/nm-iodine.h    |   58 +++++-------
 src/Makefile.am           |    4 +-
 src/nm-iodine-service.c   |  195 +++++++++++++++++----------------------
 src/nm-iodine-service.h   |    7 +-
 11 files changed, 295 insertions(+), 300 deletions(-)
---