[thunderbird/f15: 2/2] Merge branch 'master' into f15

[Martin Stransky]

commit 6268510983bf9beb42119e0002c2ec83d6254259
Merge: 942b987 23aa232
Author: Martin Stransky <stransky at anakreon.cz>
Date:   Fri Dec 9 11:46:12 2011 +0100

    Merge branch 'master' into f15

 thunderbird-mozconfig |    3 ++-
 thunderbird.spec      |    5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)
---