tree 47acec4b87a07cc6c0f1965d70fea59f644903b4
parent 9140174faaf0ba318186c34707870c5f2a98b466
parent 394520a8fd73bd95a7005917587c613e9e745bfc
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'