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

[Bernard Johnson]

commit f2ceeaa70bb01a52532877bffd32936f38e010be
Merge: f717930 7c8cedb
Author: Bernard Johnson <bjohnson at symetrix.com>
Date:   Sat Mar 14 22:35:36 2015 -0600

    Merge branch 'master' into el6

 .gitignore    |  1 +
 BackupPC.spec | 13 +++++++++++--
 sources       |  2 +-
 3 files changed, 13 insertions(+), 3 deletions(-)
---
diff --cc .gitignore
index 316c77c,5713cb9..879fb57
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,3 +1,2 @@@
 -BackupPC-3.1.2.tar.gz
  /BackupPC-3.3.0.tar.gz
+ /BackupPC-3.3.1.tar.gz