Merge branch 'sipgate'
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 15 Jun 2011 14:48:11 +0000 (16:48 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 15 Jun 2011 14:48:11 +0000 (16:48 +0200)
commit1d41634a0dc4de68550970c6d21c38c2fb60245e
tree969a8c6c3eced641997a9314d7adf787b1379d27
parent1fb7a59422c55486dad61d193fef3fb31333a4cd
parent394a45728238b5edbd7fbd3be319df65e19bc862
Merge branch 'sipgate'