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)
commit0eef4678714c05feb18c6b46551bc39cf3ce33ea
tree18c71cac7cbd74a7efe372accdfa63b181dabd2e
parent458c3c1366202e44377e1321cf2886c7b209f4d5
parent9b5beaee7c3513f0f1a81f0ecefe93ddf7c96d65
Merge branch 'master' of github.com:openwrt/luci