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

[Christoph Wickert]

commit 0ae21f9e972ace36d9837432055ad52cdde71a1d
Merge: db5fa87 10636bd
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date:   Wed Oct 5 11:46:36 2011 +0200

    Merge branch 'master' into f15

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