[milter-regex/el6/master: 4/4] Merge branch 'master' into el6

[Paul Howarth]

commit 69ae94c66db322aec6f2d018e15e0180419e7555
Merge: 4d790b2 bb31b40
Author: Paul Howarth <paul at city-fan.org>
Date:   Fri Aug 13 11:40:00 2010 +0100

    Merge branch 'master' into el6

 .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(-)
---