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

[Russell William Golden]

commit 3cc7261d6aa7d367019206e4570223a73e7acc15
Merge: f8826c2 f803a7c
Author: Russell Golden <niveusluna at niveusluna.org>
Date:   Sun Aug 3 09:47:26 2014 -0500

    Merge branch 'master' into el6

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