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

[Russell William Golden]

commit bd21b49f721c98afde2ee740f4c22f8b78a9563a
Merge: cddc3b9 ad232ed
Author: Russell Golden <niveusluna at niveusluna.org>
Date:   Wed Dec 19 13:37:44 2012 -0600

    Merge branch 'master' into el6

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