osiris: merge r28889
authorJo-Philipp Wich <jow@openwrt.org>
Sun, 5 Feb 2012 03:18:30 +0000 (03:18 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Sun, 5 Feb 2012 03:18:30 +0000 (03:18 +0000)
commitf5852993fc0730773ecbaf295db8608e64ae1c04
treec7343643e50fef5e2c1fc95b6a8c7139274c67da
parent875e7c19b915ce31dc7e224c0b5c5fd59e4b26b1
osiris: merge r28889

SVN-Revision: 30166
admin/osiris/Makefile
admin/osiris/files/osirisd.init