Merge pull request #53 from heil/prosody
authorsbyx <steven@midlink.org>
Mon, 21 Jul 2014 14:39:08 +0000 (16:39 +0200)
committersbyx <steven@midlink.org>
Mon, 21 Jul 2014 14:39:08 +0000 (16:39 +0200)
prosody: import from packages, add myself as the maintainer


Trivial merge