[network-manager-openvpn: 2/4] 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/4] nm-1-2: re-merge branch into master
Date: Thu, 30 Jun 2016 07:42:45 +0000 (UTC)

commit eb804211f932de5bccab3fc43f31c0a06be5f63c
Merge: 6acd068 e95cabe
Author: Thomas Haller <thaller redhat com>
Date:   Thu Jun 30 09:37:28 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]