[uglify-js/f20: 2/2] Merge branch 'master' into f20

[Jamie Nguyen]

commit 9bca30e594f20e880104baf0522169041bcf1ef6
Merge: 4a206ec d31a107
Author: Jamie Nguyen <j at jamielinux.com>
Date:   Tue Apr 1 20:38:07 2014 +0100

    Merge branch 'master' into f20

 uglify-js.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---