[network-manager-openvpn/th/no-upstream-1-2-yet: 40/40] Merge the stable branch 'nm-1-2' into master

[Thomas Haller <thaller src gnome org>]

commit 5cdbbf740accb9bc0e11a7f37ac1b54f93cdf0b9
Merge: 1400701 0bb5562
Author: Thomas Haller <thaller redhat com>
Date:   Wed May 25 16:30:42 2016 +0200

    Merge the stable branch 'nm-1-2' into master
    
    ... and don't maintain a stable branch upstream, until 'master' bumps
    the requirement of NetworkManager API to 1.3.
    
    For NetworkManager core (which provides libnm) and network-manager-applet
    (which provides libnma) we maintain stable branches like 'nm-1-0', 'nm-1-2'.
    This is useful, because those versions have different, backward-compatible
    API that is used by other projects. But what is best for NetworkManager core,
    is not necesarily best for the plugins.
    
    For the VPN plugin, on the release of 1.2.0 we also branched 'nm-1-2' off
    'master'.
    Currently, we either eagerly backport from 'master' to 'nm-1.2', in
    which case it's a lot of work with the effect of having two mostly
    identical branches. In this case 'nm-1-2' isn't any more "stable" the
    'master'.
    Or we don't backport eagerly, in which case 'master' may be less tested
    then 'nm-1-2' and less stable. On the other hand, it may also receive
    worthy improvements that are missed on 'nm-1-2'.
    
    'master' still doesn't require >= 1.3 API from NetworkManager, libnm or libnma.
    The VPN plugins are rather simple, and there is really no need to maintain two
    separate branches, which both are for 1.2 NetworkManager API.
    
    Until we actually bump the requirement of 'master' to 1.3, the 'nm-1-2'
    and 'master' branch shall be identical.
    
    This merge, resets the version number from 1.3.0 to 1.2.3.

 NEWS         |   12 ++++++++++++
 configure.ac |    2 +-
 2 files changed, 13 insertions(+), 1 deletions(-)
---