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

[Russell William Golden]

commit 7153fd1a13e1d768edd8f5d2765895bc51677911
Merge: 325e8c7 011ba63
Author: Russell Golden <niveusluna at niveusluna.org>
Date:   Sat Oct 19 12:04:18 2013 -0500

    Merge branch 'master' into el6

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