[packages_10.03.2] prosody: merge r28901, r29356
authorjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Sun, 5 Feb 2012 15:56:49 +0000 (15:56 +0000)
committerjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Sun, 5 Feb 2012 15:56:49 +0000 (15:56 +0000)
commitf48813c14db6183ffce1f6efcb773b892b0419f5
tree7490d62ce7d3f46be3527c5c12995db8c544be6f
parentfae1802d114f54cb65dbc4abf22b2f2782b7517d
[packages_10.03.2] prosody: merge r28901, r29356

git-svn-id: svn://svn.openwrt.org/openwrt/branches/packages_10.03.2@30242 3c298f89-4303-0410-b956-a3cf2f4a3e73
net/prosody/Makefile
net/prosody/files/prosody.init