From 76f03b2c04e728c902900134c179486516fc8564 Mon Sep 17 00:00:00 2001
From: Sven-Thorsten Dietrich <sven@vyatta.com>
Date: Wed, 10 Apr 2013 13:55:46 -0700
Subject: Daisy merge

---
 .frlog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.frlog b/.frlog
index 219cb369..4848ad55 100644
--- a/.frlog
+++ b/.frlog
@@ -4,3 +4,4 @@ Sat Mar  3 02:25:35 PST 2012: [new branch] at [debian/0.18.148]
 Wed Sep 26 15:56:10 PDT 2012: [Forced release] at [debian/0.18.157]
 Fri Oct 12 19:46:55 PDT 2012: [new branch] at [debian/0.18.160]
 Sat Oct 13 13:30:40 PDT 2012: [create daisy branch] at [debian/0.18.161]
+Wed Apr 10 13:55:46 PDT 2013: [Daisy merge] at [debian/0.18.166]
-- 
cgit v1.2.3