[ferm/el5: 5/5] Merge remote-tracking branch 'origin/master' into el5

[Pavel Alexeev]

commit 2857a748f79111b9544030f43bede27dee375925
Merge: 1cdff4d 6e511ec
Author: Pavel Alexeev (aka Pahan-Hubbitus) <pahan at hubbitus.info>
Date:   Thu May 23 00:36:07 2013 +0400

    Merge remote-tracking branch 'origin/master' into el5

 .gitignore |    2 ++
 ferm.spec  |   16 ++++++++++++++--
 sources    |    2 +-
 3 files changed, 17 insertions(+), 3 deletions(-)
---
diff --cc .gitignore
index eecaeaa,11c576e..c62b9f0
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,5 +1,4 @@@
 -ferm-2.0.7.tar.gz
  /ferm-2.0.9.tar.gz
  /ferm-2.1.tar.gz
+ /ferm-2.1.1.tar.gz
+ /ferm-2.1.2.tar.gz