tree d0b5b748dc9c693dc8ab8a61459e7390ee1cc2c3
parent 1d7f2f80b8e55085543752cc3e81cbb504b5338d
parent 10ca3799e7a769fe01a76cc0569db95cdf0f7c16
author Holger Hans Peter Freyther <zecke@selfish.org> 1267212081 +0100
committer Holger Hans Peter Freyther <zecke@selfish.org> 1267212081 +0100

Merge remote branch 'origin/on-waves/sccp'