[bcfg2/el6: 13/13] Merge branch 'master' into el6

[Fabian Affolter]

commit 224b827f3a74245538c1371c38d0d4e51fc76a0e
Merge: 720ef91 1dd9d6f
Author: Fabian Affolter <mail at fabian-affolter.ch>
Date:   Wed Mar 20 23:56:51 2013 +0100

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore

 .gitignore             |    7 +-
 bcfg2-1.3.0.tar.gz.gpg |    7 ++
 bcfg2.spec             |  158 +++++++++++++++++++++++++++++++-----------------
 sources                |    3 +-
 4 files changed, 114 insertions(+), 61 deletions(-)
---
diff --cc .gitignore
index 9983ae0,cef2edd..0f8cb01
--- a/.gitignore
+++ b/.gitignore
@@@ -1,15 -1,3 +1,12 @@@
- <<<<<<< HEAD
 +/bcfg2-1.1.2.tar.gz
 +/bcfg2-1.1.2.tar.gz.gpg
 +/bcfg2-1.1.2-unescaped-shell-command-fixes.patch
- 
 +/bcfg2-1.1.3.tar.gz
 +/bcfg2-1.1.3.tar.gz.gpg
 +/bcfg2-1.2.0.tar.gz
 +/bcfg2-1.2.0.tar.gz.gpg
 +/bcfg2-1.2.1.tar.gz
 +/bcfg2-1.2.1.tar.gz.gpg
- =======
  /bcfg2-1.1.0rc4.tar.gz
  /bcfg2-1.1.0rc4.tar.gz.gpg
  /tgenshi-indent.patch