Merge branch 'ejabberd-16.08'
authorAmadeusz Żołnowski <aidecoe@gentoo.org>
Sat, 10 Sep 2016 21:27:47 +0000 (22:27 +0100)
committerAmadeusz Żołnowski <aidecoe@gentoo.org>
Sat, 10 Sep 2016 21:27:47 +0000 (22:27 +0100)
commitdaa1e3ead45175465ebec110171cca484ae9a7c8
tree0d83879bf2c83248c66a204445404595a46d6ed0
parent1aa788cfee8366db0028022b202a8f9a724dc68c
parent4882d174b61e45225f402f360a3ae99f4b3b2bc5
Merge branch 'ejabberd-16.08'