From: smbaker <smbaker@fc8clean.lan>
Date: Thu, 7 Jul 2011 18:04:25 +0000 (-0700)
Subject: Merge branch 'master' of ssh://bakers@git.planet-lab.org/git/sfa
X-Git-Tag: sfa-1.0-27~13^2
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=3fef415cbd03da2d4a042f8450d564e68ed312f4

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

3fef415cbd03da2d4a042f8450d564e68ed312f4
diff --cc sfa/util/sfalogging.py
index 93e30731,199066d0..3ec03506
mode 100644,100755..100644
--- a/sfa/util/sfalogging.py
+++ b/sfa/util/sfalogging.py