[packages_10.03.2] prosody: merge r28901, r29356
authorJo-Philipp Wich <jow@openwrt.org>
Sun, 5 Feb 2012 15:56:49 +0000 (15:56 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Sun, 5 Feb 2012 15:56:49 +0000 (15:56 +0000)
commitad02c784db253b1167013c0c6dbe4234215e7374
tree7490d62ce7d3f46be3527c5c12995db8c544be6f
parent5f657159e99659b5845a78c5c759c896caf702cb
[packages_10.03.2] prosody: merge r28901, r29356

SVN-Revision: 30242
net/prosody/Makefile
net/prosody/files/prosody.init