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

[Christoph Wickert]

commit db5fa87601a74d330f91a7f6387eae80447c84e9
Merge: c069afc aada883
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date:   Thu Aug 18 15:40:05 2011 +0200

    Merge branch 'master' into f15

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