tree b862da62cf306a024ff22a2b552a6033f06c6b21
parent 4a90d22f5af99dbcb580251002e5096c9ee55ac6
parent 21d3e7aaa2b980d266274382b5ce7898bbf8c3da
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'