git: Update to 1.8.4.3

(cherry picked from commit e597d102d8f11d892d780ea1c0109a2797c374ab)
Fix broken Conflicts options

(cherry picked from commit f8a034172a42bf1f6b436df2e45677bd972d777f)
firefox: Update to 25.0.1

(cherry picked from commit 678bcc6d4d3f02ad738d408816c00091edd9d874)
nspr: Bump to 4.10.2

Signed-off-by: Shea Levy <shea@shealevy.com>
(cherry picked from commit b09f8110dbcb8bc8a1fcdb3e9a5dddb0956aba96)

Conflicts:
	pkgs/development/interpreters/python/wrapper.nix
nss: Bump

Signed-off-by: Shea Levy <shea@shealevy.com>
(cherry picked from commit 2909634cacd987550c626176c0ef4684a0f0f93a)