summaryrefslogtreecommitdiff
path: root/debian/changelog
diff options
context:
space:
mode:
authorMark O'Brien <mobrien@vyatta.com>2008-03-19 18:38:44 -0700
committerMark O'Brien <mobrien@vyatta.com>2008-03-19 18:38:44 -0700
commit0c9d369a3933779eb72f03bf3434a72144cd6ecf (patch)
tree6fabef1527f3cbe42b28001fa2c2c6ff15a84df6 /debian/changelog
parent34ee659e615b77ece0e8b8ec5e508b67fa6b8213 (diff)
parent9d9472d8b36907481d23175b1c2c42b7c78bc96d (diff)
downloadvyatta-bash-0c9d369a3933779eb72f03bf3434a72144cd6ecf.tar.gz
vyatta-bash-0c9d369a3933779eb72f03bf3434a72144cd6ecf.zip
Merge branch 'glendale' of git:/git/vyatta-bash into glendale
Conflicts: debian/changelog
Diffstat (limited to 'debian/changelog')
-rw-r--r--debian/changelog2
1 files changed, 1 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 127d7a7..ad5bc0d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,7 @@ vyatta-bash (3.1dfsg-8-vyatta-3) unstable; urgency=low
VC4.0.1
- -- Mark O'Brien <mobrien@vyatta.com> Tue, 18 Mar 2008 16:58:51 -0700
+ -- Mark O'Brien <mobrien@vyatta.com> Tue, 18 Mar 2008 19:03:18 -0700
vyatta-bash (3.1dfsg-8-vyatta-2) unstable; urgency=low