commit d553123af47a2ee485df6442cfd4b97c27ee7012 Merge: bf3a036 5d6b1e2 Author: Isis Lovecruft isis@patternsinthevoid.net Date: Wed Mar 14 23:27:27 2012 -0700

Merge branch 'master' of https://github.com/hellais/ooni-probe

plugoo/assets.py | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-)