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)

Trivial merge