diff options
author | Bert Münnich <be.muennich@googlemail.com> | 2012-06-07 21:04:22 +0200 |
---|---|---|
committer | Bert Münnich <be.muennich@googlemail.com> | 2012-06-07 21:04:22 +0200 |
commit | 4451f4a5eb62beda28cdb5f32ca57dc654b66621 (patch) | |
tree | 2133e26a16536ad589029313d2d6122ecdab64f6 | |
parent | 496c5404e94bf2159d750e08e5f4113481500883 (diff) | |
parent | e86b713f2d697c56b2b3d08ff59e00c8171d85b4 (diff) |
Merge remote-tracking branch 'origin/master'
-rw-r--r-- | sxiv.1 | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -334,7 +334,7 @@ Bert Muennich <ber.t at gmx.com> .EE .SH CONTRIBUTORS .EX -Bastien Dejean <nihilhill@gmail.com> +Bastien Dejean <nihilhill at gmail.com> Dave Reisner <d at falconindy.com> Fung SzeTat <sthorde at gmail.com> .EX |