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)
commit93fd0cbea919f2a5beda38b2097dd26eb8dbc02c
tree90fbaf02a0e60ac652a5c86acd6cfef61b0858f8
parent841810021021f0c84e24139b9c0cfacd825388ca
prosody: merge r28901, r29356

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