Merge branch 'bugfix_YN_None_2' into bugfix_YN_None_3
authorLuke Dashjr <luke-jr+git@utopios.org>
Mon, 5 Mar 2012 00:00:08 +0000 (19:00 -0500)
committerLuke Dashjr <luke-jr+git@utopios.org>
Mon, 5 Mar 2012 00:00:08 +0000 (19:00 -0500)
commitb733c0a5aeaf0a69e7db3e505b5de9c4e27ad80a
tree6fd4ffc4b6e8683d1e3302b4f64b5b57e2f6287f
parentc25e467115fc06e5687ecc52d9254f73ae933f6d
parentbbd293960c744ee4e34d809752c977fe3dd9f34d
Merge branch 'bugfix_YN_None_2' into bugfix_YN_None_3

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