From: Eric S. Raymond <esr@thyrsus.com>
Date: Fri, 17 Feb 2012 02:46:10 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.berlios.de/gitroot/sst
X-Git-Tag: 2.2~115
X-Git-Url: https://jxself.org/git/?p=super-star-trek.git;a=commitdiff_plain;h=b039f9f202f3a7774e5daa92f8cd0ed9940045a8

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

b039f9f202f3a7774e5daa92f8cd0ed9940045a8