Merge branch 'master' of ssh://git.berlios.de/gitroot/sst
authorEric S. Raymond <esr@thyrsus.com>
Fri, 17 Feb 2012 02:46:10 +0000 (21:46 -0500)
committerEric S. Raymond <esr@thyrsus.com>
Fri, 17 Feb 2012 02:46:10 +0000 (21:46 -0500)
1  2 
sst.py

diff --cc sst.py
Simple merge