commit 1dfc59132992856546f393e7d66ddcfde07003b1 Merge: 13dae38 18802c4 Author: Martin Stransky <stransky at anakreon.cz> Date: Tue Oct 18 11:20:28 2011 +0200 Merge branch 'master' into f15 xulrunner.spec | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) ---