[BackupPC/el6: 31/31] Merge branch 'master' into el6

[Bernard Johnson]

commit f7179300cce0e3022361cdbc240970686490569a
Merge: 597105e b45016b
Author: Bernard Johnson <bjohnson at symetrix.com>
Date:   Sat Feb 22 18:56:43 2014 -0700

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore

 .gitignore                                  |    2 +-
 BackupPC-3.2.1-fix-XSS-vulnerability.patch  |   41 ------------
 BackupPC-3.2.1-fix-XSS-vulnerability2.patch |   18 -----
 BackupPC-3.2.1-qw.patch                     |   28 --------
 BackupPC-3.3.0-fix-shadow-access.patch      |   24 +++++++
 BackupPC.spec                               |   95 +++++++++++++++++++++++----
 README.RHEL                                 |    2 +-
 backuppc.service                            |    2 +-
 sources                                     |    2 +-
 9 files changed, 109 insertions(+), 105 deletions(-)
---
diff --cc .gitignore
index 0b0fffe,76fd675..316c77c
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
- BackupPC-3.1.0.tar.gz
 -BackupPC-3.1.2.tar.gz
+ /BackupPC-3.3.0.tar.gz