commit ed32ede351e1791e72e780fffae6ba2dc997cea8 Merge: e67d498 9e35d86 Author: Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> Date: Wed Jan 4 21:22:27 2012 +0100 Merge branch 'master' into el6 mod_evasive.spec | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) ---