Merge branch 'master' of github.com:openwrt/luci
authorManuel Munz <munz@comuno.net>
Sat, 30 May 2015 14:57:30 +0000 (16:57 +0200)
committerManuel Munz <munz@comuno.net>
Sat, 30 May 2015 14:57:30 +0000 (16:57 +0200)

Trivial merge