[bcfg2/el6: 23/23] Merge 'master' into el6: 1.3.3 upstream specfile reconciliation

[John Morris]

commit 2d567d9278c84da228fbab78236a81bf2ebd6dcb
Merge: fe0e7e2 316afe0
Author: John Morris <john at zultron.com>
Date:   Sat Nov 23 14:50:22 2013 -0600

    Merge 'master' into el6:  1.3.3 upstream specfile reconciliation
    
    Merging with master
    - specfile reconciliation with upstream
    - update to 1.3.3
    
    Conflicts:
    	.gitignore
    	bcfg2.spec
    	branch

 .gitignore             |   47 +---
 bcfg2-1.3.0.tar.gz.gpg |    7 -
 bcfg2.spec             |  677 ++++++++++++++++++++++++++++++++++++++----------
 branch                 |    5 -
 sources                |    3 +-
 5 files changed, 550 insertions(+), 189 deletions(-)
---