[shorewall/f14: 2/2] Merge branch 'f15' into f14

[Jonathan G. Underwood]

commit a4a049051db1c3fac8085b74ea4cdf89da8bb144
Merge: fd28c65 4104d92
Author: Jonathan G. Underwood <jonathan.underwood at gmail.com>
Date:   Mon Aug 22 16:26:48 2011 +0100

    Merge branch 'f15' into f14

 shorewall.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---