[check-mk/f19: 15/15] Merge changes from master

[averi]

commit 3adf7762e2c51e4ee76af9adc7fc01826bd90f07
Merge: 2261952 8bdc187
Author: Andrea Veri <av at gnome.org>
Date:   Tue Mar 25 18:10:14 2014 +0100

    Merge changes from master

 .gitignore    |    2 --
 check-mk.spec |    1 -
 2 files changed, 0 insertions(+), 3 deletions(-)
---
diff --cc .gitignore
index fe71c2e,46d52a3..95ae274
--- a/.gitignore
+++ b/.gitignore
@@@ -1,3 -1,2 +1,1 @@@
--/check_mk-1.2.2.tar.gz
--/check_mk-1.2.2p2.tar.gz
 +/check_mk-1.2.4.tar.gz