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

[Russell William Golden]

commit 325e8c7e81496b115ce3a1be65dab2d58ee8006c
Merge: e63b110 0b5a8d8
Author: Russell Golden <niveusluna at niveusluna.org>
Date:   Thu Aug 1 14:11:47 2013 -0500

    Merge branch 'master' into el6

 mozilla-adblockplus.spec |   43 +++++++++++++++++++++++++++++++++----------
 1 files changed, 33 insertions(+), 10 deletions(-)
---