Merge branch 'debian' of ssh://ray.cslab.ece.ntua.gr/repos/archip into debian
authorFilippos Giannakos <philipgian@grnet.gr>
Fri, 30 Nov 2012 12:15:38 +0000 (14:15 +0200)
committerFilippos Giannakos <philipgian@grnet.gr>
Fri, 30 Nov 2012 12:15:38 +0000 (14:15 +0200)
commit343caf2b8842874534de79e1a1b0f057de41a5cf
tree10c6236ea42b4a4853dc21f4b0ffa50ae53e34ba
parent5653127514470efad4407fd8545002d6c283f3c6
parentf66a301417796517523b12302ce795acf3288638
Merge branch 'debian' of ssh://ray.cslab.ece.ntua.gr/repos/archip into debian

Conflicts:
debian/control
debian/control