luci-0.10: merge r6695 and r6696
authorJo-Philipp Wich <jow@openwrt.org>
Mon, 10 Jan 2011 00:44:43 +0000 (00:44 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Mon, 10 Jan 2011 00:44:43 +0000 (00:44 +0000)
commiteaa05f9f293b0680a5791239021422fdc2cbc68d
tree2cb2fb150a48738e4406467ca34693561db50e22
parent4370e52a975c4e519ff56aded517ade7cdc3837e
parent8b1167fb91864e16a4e6b9d73cd607174b203d9d
luci-0.10: merge r6695 and r6696