merge branch changes into trunk
[project/luci.git] / po / templates / asterisk.pot