tree 42f7a8b58bcd4837c38534e740fa6115363c27de
parent e41a14b40cd805db53855c4792321488d9698468
parent 0557c0059ea9843f0c8e05fde0ecabd9e8c53109
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'