Merge commit '1b1682894f7c199bc6be' into deb-scripts
authorP. Christeas <p_christ@hol.gr>
Tue, 19 Oct 2010 10:36:07 +0000 (13:36 +0300)
committerP. Christeas <p_christ@hol.gr>
Tue, 19 Oct 2010 10:36:07 +0000 (13:36 +0300)
commit4f4164b7f3fa7813ab82367fdc2f446902efc837
tree99a6124bb6ab14ac570be4a0d5a52d72fcff4c38
parente1fa6b05337803715cb9471e8cf2f1a615949367
parent39eeb881a29bbaff8f79063de38378a5e7013e06
Merge commit '1b1682894f7c199bc6be' into deb-scripts

Conflicts:
debian/rules

bzr revid: p_christ@hol.gr-20101019103607-dztha2agnnlt8jzx
debian/rules