fix changelog merge fail

git-svn-id: http://encfs.googlecode.com/svn/trunk@75 db9cf616-1c43-0410-9cb8-a902689de0d6
This commit is contained in:
Valient Gough 2011-12-29 22:27:17 +00:00
parent eccdf3c9e6
commit 275d4be255

View File

@ -1,6 +1,3 @@
Mon Jun 13 2011 Valient Gough <vgough@pobox.com>
* fix for non-b64 conversions, issue 102 patch by gebart.
Wed Dec 28 2011 Valient Gough <vgough@pobox.com> Wed Dec 28 2011 Valient Gough <vgough@pobox.com>
* remove m4-local * remove m4-local
* bump version to 1.7.5 * bump version to 1.7.5