tree 3da9543334f702ec951daba624c6248f2fe64a9d
parent 7184c2d7d2a97b837362a300727adbe45315ebfc
parent b2abbe8a9384e1a873f8cfb135569dbcc5061d41
author Holger Hans Peter Freyther <zecke@selfish.org> 1266172072 +0100
committer Holger Hans Peter Freyther <zecke@selfish.org> 1266172072 +0100

Merge branch 'on-waves/sccp'