Merge branch 'master' of https://github.com/openwrt/telephony
authorMazi Lo <openwrt.mazilo@xoxy.net>
Sun, 14 May 2017 17:40:48 +0000 (13:40 -0400)
committerMazi Lo <openwrt.mazilo@xoxy.net>
Sun, 14 May 2017 17:40:48 +0000 (13:40 -0400)

Trivial merge