[tor-commits] [metrics-tasks/master] Merge remote-tracking branch 'gsathya/master'

[karsten at torproject.org]

commit b939e76767191ae28cf7d4308838e24e64c52ccf
Merge: c4c6d16 9fb1eae
Author: Karsten Loesing <karsten.loesing at gmx.net>
Date:   Mon Jul 9 12:19:36 2012 +0200

    Merge remote-tracking branch 'gsathya/master'

 task-6232/pyentropy.py |   64 ++++++++++++++++++-----------------------------
 1 files changed, 25 insertions(+), 39 deletions(-)