Merge branch 'master' into sipgate
authorAlexander Stintzing <alex@stintzing.net>
Tue, 26 Jul 2011 15:04:05 +0000 (17:04 +0200)
committerAlexander Stintzing <alex@stintzing.net>
Tue, 26 Jul 2011 15:04:05 +0000 (17:04 +0200)
commit9f2d213dd7376c326cb881fe85604d549f94feb4
tree85eea575b311b3fcf5fc30f2631bc765d72f77b9
parent23aaf6a7b5c60ecaf9f87e06779528e9d2351451
parentf8718180cafe143df261c862a7152a0b6eca6b8d
Merge branch 'master' into sipgate