[yumex/el6] (3 commits) ...Merge branch 'master' into el6

[Tim Lauridsen]

Summary of changes:

  819c8d1... Release 3.0.4-1 (*)
  67f4b6e... Release 3.0.4-1 (*)
  9a8d15a... Merge branch 'master' into el6

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