[mozilla-adblockplus/el6] (6 commits) ...Merge branch 'master' into el6

Sun Aug 3 15:01:19 UTC 2014

Summary of changes:

  ca05728... Update specfile for EPEL7. I hope. (*)
  b4b91ec... Fix some more conditionals for EPEL 7 (*)
  00a6442... try again... (*)
  bfda80c... Update sources to 2.6.4 (*)
  f803a7c... update spec file to 2.6.4 (*)
  3cc7261... Merge branch 'master' into el6

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