diff options
author | Marius Halden <marius.h@lden.org> | 2017-04-07 10:24:13 +0200 |
---|---|---|
committer | Marius Halden <marius.h@lden.org> | 2017-04-07 10:24:13 +0200 |
commit | dd46ae5bef1c34773a3e7d3e2ef48fc013cef283 (patch) | |
tree | decbedfb7b847c01493dc95890f2169b4b0e31f3 /doc/CREDITS | |
parent | febcb6dca01bb17e0197770a0e6596aaa98bcdbd (diff) | |
parent | 051506399e1455d88f6179010129308c754be936 (diff) |
Merge branch 'master' into patched-master
Diffstat (limited to 'doc/CREDITS')
-rw-r--r-- | doc/CREDITS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/CREDITS b/doc/CREDITS index d53f6de0..b77a851a 100644 --- a/doc/CREDITS +++ b/doc/CREDITS @@ -21,7 +21,7 @@ The authors thank the following people: bug reports. - Bryan Williams, for the help in getting BitlBee to run on Cygwin. - Peter van Dijk for discovering a security leak in BitlBee. -- Christian Häggeström, for the fix for the Jabber barf on high ASCII +- Christian Häggeström, for the fix for the Jabber barf on high ASCII characters in away messages. - James Ray, for some testing, development and patching. - Yuri Pimenov, for writing the charset/iconv code, requested by a |