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

[Jamie Nguyen]

commit 949460576ad9cdf7d2fc839f1fa96eb70a4192fc
Merge: bc3a398 b679f9b
Author: Jamie Nguyen <j at jamielinux.com>
Date:   Sat Mar 15 15:32:03 2014 +0000

    Merge branch 'master' into f20
    
    Conflicts:
    	sources

 .gitignore     |    1 +
 sources        |    2 +-
 uglify-js.spec |   77 ++++++++++++++++++++++++++++++++++++++++++-------------
 3 files changed, 61 insertions(+), 19 deletions(-)
---