Imported Upstream version 2.6.13
Merge tag 'upstream/2.6.13'

Upstream version 2.6.13

* tag 'upstream/2.6.13':
  Imported Upstream version 2.6.13
New upstream release.
Sync debian/redis.conf.
Update 02-fix-ftbfs-on-kfreebsd.diff.
releasing version 2:2.6.13-1