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

[Russell William Golden]

commit f8826c248337e1c397169f4c4fb454218fb53403
Merge: 0980895 7a6eae3
Author: Russell Golden <niveusluna at niveusluna.org>
Date:   Thu Jun 26 10:40:43 2014 -0500

    Merge branch 'master' into el6

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