commit b2d9e509b4c513aa2e253a550fd832fb9c86a94e Merge: b939e76 cc86e84 Author: Karsten Loesing <karsten.loesing@gmx.net> Date: Mon Jul 9 16:16:24 2012 +0200 Merge remote-tracking branch 'gsathya/master' task-6232/pyentropy.py | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-)