commit | 1d7f2f80b8e55085543752cc3e81cbb504b5338d | [log] [tgz] |
---|---|---|
author | Holger Hans Peter Freyther <zecke@selfish.org> | Fri Feb 26 20:20:17 2010 +0100 |
committer | Holger Hans Peter Freyther <zecke@selfish.org> | Fri Feb 26 20:20:17 2010 +0100 |
tree | 1229a0bfb2bb0093dec05959fd4bbfca557d64c9 | |
parent | 140f6e9b12fcb83d161dc1cd8c5d6972ef86fc7c [diff] | |
parent | 1ebad7437729d6abbf5308de19161b0574e3451a [diff] |
Merge remote branch 'origin/on-waves/mgcp'