ushare: merge r29174, r29198
authorJo-Philipp Wich <jow@openwrt.org>
Sun, 5 Feb 2012 14:58:36 +0000 (14:58 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Sun, 5 Feb 2012 14:58:36 +0000 (14:58 +0000)
commit52bf9f671c03060d1a507289cad005f20e38d8eb
tree7b67aa84a30a8ab553d7c7000ab13a819bc644f3
parente0754f7c3aad943c1fe4f7c80b419a2325962b9f
ushare: merge r29174, r29198

SVN-Revision: 30190
multimedia/ushare/Makefile
multimedia/ushare/files/ushare.config
multimedia/ushare/files/ushare.init