From b13abe6552b041a108a7b21d9e1e2499e0677935 Mon Sep 17 00:00:00 2001
From: Sean Whitton <spwhitton@spwhitton.name>
Date: Wed, 20 Apr 2016 12:20:32 -0700
Subject: merge changelogs

- easier to maintain
- preserves history of Joey's old changes
- permitted by policy
---
 CHANGELOG | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)
 mode change 100644 => 120000 CHANGELOG

(limited to 'CHANGELOG')

diff --git a/CHANGELOG b/CHANGELOG
deleted file mode 100644
index e9623ce..0000000
--- a/CHANGELOG
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- -*- mode: markdown; -*- -->
-
-# Version 1.0.0 (UNRELEASED) #
-
-* Taking over as upstream maintainer.
-  Closes https://github.com/bluss/git-remote-gcrypt/issues/12
-* Remove notice about repository format potentially changing.
-* Implement GCRYPT_GPG_ARGS environment variable (Closes: #771011).
-* Respect git config gpg.program if configured.
-  Thanks Christian Amsüss.
-  Closes https://github.com/joeyh/git-remote-gcrypt/pull/3
diff --git a/CHANGELOG b/CHANGELOG
new file mode 120000
index 0000000..d526672
--- /dev/null
+++ b/CHANGELOG
@@ -0,0 +1 @@
+debian/changelog
\ No newline at end of file
-- 
cgit v1.2.3