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

[Russell William Golden]

commit 0a4b29c262715512880a4fc813f2e4fa3597c343
Merge: bd21b49 e2727a9
Author: Russell Golden <niveusluna at niveusluna.org>
Date:   Sat Feb 2 19:11:32 2013 -0600

    Merge branch 'master' into el6

 .gitignore                                         |    1 +
 ...tch => mozilla-adblockplus-2.2.2-buildNum.patch |    6 +++---
 mozilla-adblockplus.spec                           |   14 +++++++++++---
 sources                                            |    2 +-
 4 files changed, 16 insertions(+), 7 deletions(-)
---