Merge remote-tracking branch 'origin/master'

This commit is contained in:
Bert Münnich 2012-06-07 21:04:22 +02:00
commit 4451f4a5eb

2
sxiv.1
View File

@ -334,7 +334,7 @@ Bert Muennich <ber.t at gmx.com>
.EE .EE
.SH CONTRIBUTORS .SH CONTRIBUTORS
.EX .EX
Bastien Dejean <nihilhill@gmail.com> Bastien Dejean <nihilhill at gmail.com>
Dave Reisner <d at falconindy.com> Dave Reisner <d at falconindy.com>
Fung SzeTat <sthorde at gmail.com> Fung SzeTat <sthorde at gmail.com>
.EX .EX