Merge branch 'master' of git.nanl.de:openwrt/telephony