[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: Mon, 27 Jun 2016 09:03:13 +0000 (UTC)

commit 13ce0e2d1a4601f4539e56b198612c288f9ca8c8
Merge: bdbb5de 692afcc
Author: Thomas Haller <thaller redhat com>
Date:   Mon Jun 27 11:02:20 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]