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

[Russell William Golden]

commit b92e705fc4ec6d1861ca4f5fe4f48ff07e84b586
Merge: 53698ad 6a4150d
Author: Russell Golden <niveusluna at niveusluna.org>
Date:   Thu Jul 19 17:16:27 2012 -0500

    Merge branch 'master' into el6

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