From: Eric S. Raymond <esr@thyrsus.com>
Date: Mon, 6 Dec 2010 00:09:58 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.berlios.de/gitroot/sst
X-Git-Tag: 2.1~8
X-Git-Url: https://jxself.org/git/?p=super-star-trek.git;a=commitdiff_plain;h=bb82c32bd0bcb35f79aa61b2c6650f7067fab537

Merge branch 'master' of ssh://git.berlios.de/gitroot/sst
---

bb82c32bd0bcb35f79aa61b2c6650f7067fab537
diff --cc sst.py
index a97268c,9b36285..a97268c
mode 100644,100755..100755
--- a/sst.py
+++ b/sst.py