Merge branch 'bugfix_YN_None' into bugfix_YN_None_2
authorLuke Dashjr <luke-jr+git@utopios.org>
Sun, 4 Mar 2012 23:58:45 +0000 (18:58 -0500)
committerLuke Dashjr <luke-jr+git@utopios.org>
Sun, 4 Mar 2012 23:58:45 +0000 (18:58 -0500)
commitbbd293960c744ee4e34d809752c977fe3dd9f34d
tree827d343bc877ae4a1dfe12561eff69567cf3b8cc
parent5d4dd3f167e76419e4eede978b76374044fcdb18
parent9cb0f181efe4a3cab61390efdfb6473b7bdb2c98
Merge branch 'bugfix_YN_None' into bugfix_YN_None_2

Conflicts:
sharelogging/logfile.py
sharelogging/logfile.py
util.py