tree 95dbb09e56e39c9d2e804c86317012447aa47729
parent 91b5a31a2ce73b988fa1c7f28e3a2cc2c8b77b90
parent b71517f07ec46558bc6032bdaa27650f8bef634d
author Holger Hans Peter Freyther <zecke@selfish.org> 1270673652 +0200
committer Holger Hans Peter Freyther <zecke@selfish.org> 1270673652 +0200

Merge branch 'on-waves/sccp'