merge r30317
authorJo-Philipp Wich <jow@openwrt.org>
Sun, 5 Feb 2012 19:45:56 +0000 (19:45 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Sun, 5 Feb 2012 19:45:56 +0000 (19:45 +0000)
commit475737da37f190c8985e43158b50ab20d72ec941
tree275dea0e47c830690ed5736967c534456689bae1
parent4e51438df238b2eff631af5c3b61a16a2c6e5829
merge r30317

SVN-Revision: 30318
admin/syslog-ng/Makefile
admin/syslog-ng/files/syslog-ng.init