summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniil Baturin <daniil.baturin@vyatta.com>2012-03-23 00:34:31 +0700
committerDaniil Baturin <daniil.baturin@vyatta.com>2012-03-23 00:34:31 +0700
commit809a64b76f45405afd00d2795a4511961f96a68f (patch)
tree66e2799816f777b0de244d0e98fc0af101da24b8
parenta97c203863e2e6b052897dcd4b0e7e5e3c0805a0 (diff)
parenta0f6002622d9df2345f147549f0af5a40d3326e5 (diff)
downloadvyatta-nat-809a64b76f45405afd00d2795a4511961f96a68f.tar.gz
vyatta-nat-809a64b76f45405afd00d2795a4511961f96a68f.zip
Merge branch 'oxnard' of git.vyatta.com:/git/vyatta-nat into oxnard
-rw-r--r--.frlog1
-rw-r--r--debian/changelog6
2 files changed, 7 insertions, 0 deletions
diff --git a/.frlog b/.frlog
index bd6b5b0..28300d6 100644
--- a/.frlog
+++ b/.frlog
@@ -1,2 +1,3 @@
Tue Dec 28 13:50:00 PST 2010: [new branch] at [debian/0.12.30]
Thu Jul 7 20:57:28 PDT 2011: [new branch] at [debian/0.12.31]
+Sat Mar 3 02:23:28 PST 2012: [new branch] at [debian/0.12.33]
diff --git a/debian/changelog b/debian/changelog
index 4f33c9f..53eafdc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+vyatta-nat (0.12.33+oxnard1) unstable; urgency=low
+
+ * new branch
+
+ -- Deepti Kulkarni <deepti@vyatta.com> Sat, 03 Mar 2012 02:23:29 -0800
+
vyatta-nat (0.12.33) unstable; urgency=low
[ Mohit Mehta ]