[xulrunner/f19: 2/2] Merge branch 'master' into f19

[Martin Stransky]

commit 16b10b81e1dc180b7e0f1ee77ef6781dbef8d96c
Merge: 1d0c1d7 163c167
Author: Martin Stransky <stransky at anakreon.cz>
Date:   Wed Apr 3 10:10:28 2013 +0200

    Merge branch 'master' into f19

 xulrunner.spec |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
---