[tor-commits] [ooni-probe/master] Merge branch 'master' of ssh://git-rw.torproject.org/ooni-probe into designimprove

[art at torproject.org]

commit 500790c55d4742b41d680dc2f9f59e405c49ea66
Merge: d68e5f4 ce8e175
Author: Arturo Filastò <art at torproject.org>
Date:   Mon Jul 9 11:57:11 2012 +0200

    Merge branch 'master' of ssh://git-rw.torproject.org/ooni-probe into designimprove

 ooni/plugoo/reports.py |   10 +++-------
 1 files changed, 3 insertions(+), 7 deletions(-)