tree 42f7a8b58bcd4837c38534e740fa6115363c27de
parent b492d39177f6df893772ee6c7c37f51caa9f0d64
parent 452c183c5ee9cc2c1b0225d9706d0425b8c655e3
author Jacob Erlbeck <jerlbeck@sysmocom.de> 1401972307 +0200
committer Jacob Erlbeck <jerlbeck@sysmocom.de> 1401972307 +0200

Merge remote-tracking branch 'origin/jerlbeck/features/mgcp-transcoding'