tree 3da9543334f702ec951daba624c6248f2fe64a9d
parent 88c2209ffb39c457bfc16b3c8b61d5dd38043056
parent df6d2a5ffb153dcf957579a7e65e7bffee18e837
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'