[network-manager-openvpn: 2/2] nm-1-2: re-merge branch into master

From: Thomas Haller <thaller src gnome org>
To: commits-list gnome org
Cc:
Subject: [network-manager-openvpn: 2/2] nm-1-2: re-merge branch into master
Date: Sun, 10 Jul 2016 12:14:18 +0000 (UTC)

commit 8049d98feb864b92ccaf2f857593cbf29f015e49
Merge: 852a1a7 e01f00f
Author: Thomas Haller <thaller redhat com>
Date:   Sun Jul 10 14:12:22 2016 +0200

    nm-1-2: re-merge branch into master
    
    For now, master and nm-1-2 shall be the same. They shall not split.
    Merge them together again.
    
    See commit ccd275d266f92524d9ef5ebd48d66845daa8b5c5.

---

[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]