commit 38d4b7ec0f0fb786ec903ffb422c977684b5d695 Merge: 67e28b0 664bec7 Author: Jan Horak <jhorak at redhat.com> Date: Wed Dec 7 13:19:14 2011 +0100 Merge branch 'master' of ssh://pkgs.fedoraproject.org/xulrunner Conflicts: xulrunner.spec ---