Merge pull request #90 from malexmave/ejabberd-update
authorAaron Zauner <azet@azet.org>
Thu, 3 Mar 2016 23:23:53 +0000 (00:23 +0100)
committerAaron Zauner <azet@azet.org>
Thu, 3 Mar 2016 23:23:53 +0000 (00:23 +0100)
Updated for newer versions of ejabberd

1  2 
src/acknowledgements.tex
src/practical_settings/im.tex

Simple merge
Simple merge