[mozilla-adblockplus/el6: 4/6] Merge branch 'master' into el6

[Russell William Golden]

commit 098089564696f4d78e74e6377b107eb88682b3b3
Merge: cd13728 897eab5
Author: Russell Golden <niveusluna at niveusluna.org>
Date:   Thu Jun 26 10:38:40 2014 -0500

    Merge branch 'master' into el6

 .gitignore               |    1 +
 mozilla-adblockplus.spec |    9 +++++++--
 sources                  |    2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)
---