tree 47acec4b87a07cc6c0f1965d70fea59f644903b4
parent 3d315278b54fa4ac7c7f7910ea22cb1a222da5ab
parent 6d464dd4b802defe45a6df2f0baa7a1bf9568338
author Holger Hans Peter Freyther <zecke@selfish.org> 1276592805 +0800
committer Holger Hans Peter Freyther <zecke@selfish.org> 1276592805 +0800

Merge branch 'on-waves/sccp'