Merge branch 'master' of https://github.com/openwrt/luci into proto=ipv6+aiccu+fixes
authorPaul Oranje <p.oranje@xs4all.nl>
Sat, 2 May 2015 08:44:17 +0000 (10:44 +0200)
committerPaul Oranje <p.oranje@xs4all.nl>
Sat, 2 May 2015 08:44:17 +0000 (10:44 +0200)

Trivial merge