Merge branch 'ejabberd-16.04-r1'
authorAmadeusz Żołnowski <aidecoe@gentoo.org>
Sat, 27 Aug 2016 13:27:45 +0000 (14:27 +0100)
committerAmadeusz Żołnowski <aidecoe@gentoo.org>
Sat, 27 Aug 2016 13:27:45 +0000 (14:27 +0100)
commitf3a3851cacabf3be1e4ae053c6cd1db1037a5637
treef2fee71df7b32940dd1805ff169e71138bbba432
parentd4a1c361913fb410761ab070858258b2093bc55e
parentb0275c3408ac007193ea244ef1c6e367443ed5ce
Merge branch 'ejabberd-16.04-r1'