[tbb-commits] [tor-browser/tor-browser-31.6.0esr-4.5-1] Merge remote-tracking branch 'gk/bug_10761_v2' into tor-browser-31.6.0esr-4.5-1

[mikeperry at torproject.org]

commit e1a8bafb44367592bc982c2a65752ec439b515a6
Merge: 5ad57a0 c9944b9c
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Wed Apr 15 22:16:33 2015 -0700

    Merge remote-tracking branch 'gk/bug_10761_v2' into tor-browser-31.6.0esr-4.5-1

 security/nss/coreconf/WIN32.mk |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)