[dspam/el6] (2 commits) ...Merge branch 'f15' into el6

[Nathanael Noblet]

Summary of changes:

  8af1ab0... fix changelog date (*)
  46b8530... Merge branch 'f15' into el6

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