Merge branch 'debian'
authorCédric Villemain <cedric@2ndquadrant.fr>
Thu, 15 Sep 2016 12:40:45 +0000 (14:40 +0200)
committerCédric Villemain <cedric@2ndquadrant.fr>
Thu, 15 Sep 2016 12:40:45 +0000 (14:40 +0200)
commitaf9d776ca5b8d75f5cfd08dde904733e482e7d7e
tree27415f357c39b52267c15b09bc71fa918f9d7bf0
parente8d5a1692282461415616c7d79a0457214238f3a
parent09e9c03231604292c333a3129b4cdf44b4b1d906
Merge branch 'debian'

Conflicts:
debian/changelog
debian/changelog