[tor-commits] [compass/master] Merge remote-tracking branch 'mzeltner/master'

[karsten at torproject.org]

commit 88c67e0a5b4b03ed33e9d487ed9961dbb5aa4e72
Merge: e0f2eb1 716f196
Author: Karsten Loesing <karsten.loesing at gmx.net>
Date:   Mon Aug 20 11:10:57 2012 +0200

    Merge remote-tracking branch 'mzeltner/master'

 compass.py |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)