[BackupPC/el6] (5 commits) ...Merge branch 'master' into el6

[Bernard Johnson]

Summary of changes:

  dd0e33e... - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass (*)
  df10f9d... - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_M (*)
  27fbd0f... v 3.3.1 (*)
  7c8cedb... v 3.3.1 (*)
  f2ceeaa... Merge branch 'master' into el6

(*) This commit already existed in another branch; no separate mail sent