Merge remote branch 'dimitri/debian'
authorCédric Villemain <cedric@2ndQuadrant.fr>
Sat, 4 Dec 2010 14:59:43 +0000 (15:59 +0100)
committerCédric Villemain <cedric@2ndQuadrant.fr>
Sat, 4 Dec 2010 14:59:43 +0000 (15:59 +0100)
commit6867471d85a18b34d12509fdbf36496f76edcc0d
tree372376b2c194bcfed652e87c063a275076a437aa
parentdcea764c4a3523b4f89b7ee06d84b316b5ccc89a
parent6684c4eabbdece2c1b4b5ff8eae99c1b6b8f2543
Merge remote branch 'dimitri/debian'

Conflicts:
debian/changelog
debian/rules