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

[Martin Stransky]

commit 2c2ab4fec54fd8aec43a7eb65d7cbb247c1d0cf6
Merge: 6bf8d6e e958266
Author: Martin Stransky <stransky at redhat.com>
Date:   Tue May 21 14:14:10 2013 +0200

    Merge branch 'master' into f19

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