tree bf54059ec5ed10267bdaa585b69aa530f0b41cf5
parent 32be2aa1e4c5d1d4df72c8bfd7d85551747157a8
parent e8d13719f2f6f8c431a50564c9e3a96776a7eba5
author Holger Hans Peter Freyther <zecke@selfish.org> 1271479566 +0200
committer Holger Hans Peter Freyther <zecke@selfish.org> 1271479566 +0200

Merge branch 'on-waves/mgcp'