From: Tony Mack <tmack@paris.CS.Princeton.EDU>
Date: Thu, 7 Jul 2011 18:37:43 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.planet-lab.org/git/sfa
X-Git-Tag: sfa-1.0-27~13
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=4e586130550a39a9a228302ecaf99c30ffd15023;p=sfa.git

Merge branch 'master' of ssh://git.planet-lab.org/git/sfa
---

4e586130550a39a9a228302ecaf99c30ffd15023
diff --cc sfa/util/sfalogging.py
index f1ab1778,3ec03506..5dd17d0f
mode 100755,100644..100644
--- a/sfa/util/sfalogging.py
+++ b/sfa/util/sfalogging.py