From 2e3fec68c08223105009711f5edfd20628da8996 Mon Sep 17 00:00:00 2001
From: Martin Stransky <stransky@redhat.com>
Date: Jun 25 2015 11:32:41 +0000
Subject: Merge branch 'master' into f20


---

diff --git a/.gitignore b/.gitignore
index b237157..f47c9cd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -145,3 +145,4 @@ firefox-3.6.4.source.tar.bz2
 /firefox-langpacks-38.0.5-20150603.tar.xz
 /firefox-39.0.source.tar.bz2
 /firefox-langpacks-39.0-20150623.tar.xz
+/firefox-langpacks-39.0-20150625.tar.xz
diff --git a/firefox.spec b/firefox.spec
index 241126d..533d89d 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -107,13 +107,13 @@
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
 Version:        39.0
-Release:        1%{?pre_tag}%{?dist}
+Release:        2%{?pre_tag}%{?dist}
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
 Source0:        ftp://ftp.mozilla.org/pub/firefox/releases/%{version}%{?pre_version}/source/firefox-%{version}%{?pre_version}.source.tar.bz2
 %if %{build_langpacks}
-Source1:        firefox-langpacks-%{version}%{?pre_version}-20150623.tar.xz
+Source1:        firefox-langpacks-%{version}%{?pre_version}-20150625.tar.xz
 %endif
 Source10:       firefox-mozconfig
 Source11:       firefox-mozconfig-branded
@@ -805,8 +805,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #---------------------------------------------------------------------
 
 %changelog
-* Tue Jun 23 2015 Martin Stransky <stransky@redhat.com> - 39.0-1
-- Update to 39.0
+* Thu Jun 25 2015 Martin Stransky <stransky@redhat.com> - 39.0-2
+- Update to 39.0 Build 4
 
 * Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 38.0.5-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
diff --git a/sources b/sources
index d4a561a..5076c07 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,2 @@
-60466afbc7105d29dcd18f996c9c67e0  firefox-38.0.5.source.tar.bz2
-7ea2618f34a9c6885599da8e9655a2c3  firefox-langpacks-38.0.5-20150603.tar.xz
-5019e37dbaea582f01399be6cce334e2  firefox-39.0.source.tar.bz2
-eceaa0e99971d5f63314cc4387083e82  firefox-langpacks-39.0-20150623.tar.xz
+3211c98e22dae99fc944970540f32171  firefox-39.0.source.tar.bz2
+b27c0e259560d8b66d34fa50085b216e  firefox-langpacks-39.0-20150625.tar.xz