[milter-regex/f13/master: 3/3] Merge branch 'master' into f13

[Paul Howarth]

commit 5be29c44d5a9bf7a99831be399ab2e449e5bddc4
Merge: 8ec63ec bb31b40
Author: Paul Howarth <paul at city-fan.org>
Date:   Fri Aug 13 11:27:20 2010 +0100

    Merge branch 'master' into f13

 .gitignore                     |    2 +-
 milter-regex-1.8-strlcat.patch |   96 ++++++++++++++++++++++++++++++++++++++++
 milter-regex-initscript        |    1 +
 milter-regex.spec              |   33 +++++++++-----
 sources                        |    2 +-
 5 files changed, 121 insertions(+), 13 deletions(-)
---