Bug 1062880 - Update JDK to 1.7.0 in mock config - r=jlund
Bug 989531 - add NSIS 3.0a2 to PATH - r=jlund
Merging from default

changeset:   3150:1f4fb0a896d7
parent:      3148:aad7cd307d5d
user:        Chris Cooper <ccooper@deadsquid.com>
date:        Fri Sep 05 11:16:09 2014 -0400
summary:     Bug 1062880 - Update JDK to 1.7.0 in mock config - r=jlund

changeset:   3151:7a97ca6fb0c2
tag:         tip
user:        Chris Cooper <ccooper@deadsquid.com>
date:        Fri Sep 05 17:17:05 2014 -0400
summary:     Bug 989531 - add NSIS 3.0a2 to PATH - r=jlund

--HG--
branch : production