commit 2dc388e72ccfb3d5510e5880884b5faab36c6a6a Merge: 8125248 3df4f06 Author: Dan Horák <dan at danny.cz> Date: Wed Jan 19 14:49:11 2011 +0100 Merge branch 'f14' into f13 zabbix.spec | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) ---