[tor-commits] [ooni-probe/master] Merge branch 'master' into fix/report_write_failure_handler_rebased

[art at torproject.org]

commit 71552b036b911df9219e2c1f43591c2510784d57
Merge: 177e645 eb82c86
Author: Arturo Filastò <art at fuffa.org>
Date:   Tue Aug 27 11:19:35 2013 +0200

    Merge branch 'master' into fix/report_write_failure_handler_rebased
    
    * master:
      Add component.json file to ng-upload
      Update LICENSE file

 LICENSE                                   |    2 +-
 data/ui/app/libs/ng-upload/component.json |   23 +++++++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)