[dspam/el6/master] (4 commits) ...Merge remote-tracking branch 'origin/master' into el6

[Nathanael Noblet]

Summary of changes:

  58fea55... - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass (*)
  71fd1f7... move web dir to /var/www (*)
  595ce13... move web dir to /var/www (*)
  34dccaa... Merge remote-tracking branch 'origin/master' into el6

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