[network-manager-libreswan: 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-libreswan: 2/2] nm-1-2: re-merge branch into master
Date: Mon, 27 Jun 2016 16:27:47 +0000 (UTC)

commit 915ca12dbee1a9d585240332c284f259fa3ba488
Merge: 045971f 3a95af5
Author: Thomas Haller <thaller redhat com>
Date:   Mon Jun 27 18:26: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 6eb181c48168c595e9f24e3b766f0fba35f8e1b9.

---

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