[tor-commits] [ooni-probe/develop] Merge branch 'master' into task_manager

[isis at torproject.org]

commit d3ab36b744b6e8e9862fd14ffae586d1b1a8e32f
Merge: 1710ca5 6f16d8c
Author: Arturo Filastò <art at fuffa.org>
Date:   Wed Feb 27 16:36:44 2013 +0100

    Merge branch 'master' into task_manager
    
    * master:
      Order matters for little ol pip

 requirements.txt |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)