summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven-Thorsten Dietrich <sven@vyatta.com>2013-04-10 13:55:46 -0700
committerSven-Thorsten Dietrich <sven@vyatta.com>2013-04-10 13:55:46 -0700
commit76f03b2c04e728c902900134c179486516fc8564 (patch)
treeacbe706440fc2100058b3f927e47ae83586eac4b
parent125c7f05d88b15f2bdbd467031a7844c4070bcce (diff)
downloadvyatta-cfg-quagga-76f03b2c04e728c902900134c179486516fc8564.tar.gz
vyatta-cfg-quagga-76f03b2c04e728c902900134c179486516fc8564.zip
Daisy merge
-rw-r--r--.frlog1
1 files changed, 1 insertions, 0 deletions
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]