Merge branch 'packaging' into debian-0.9
authorKostas Papadimitriou <kpap@grnet.gr>
Wed, 22 Feb 2012 13:08:18 +0000 (15:08 +0200)
committerKostas Papadimitriou <kpap@grnet.gr>
Wed, 22 Feb 2012 13:08:18 +0000 (15:08 +0200)
1  2 
fabfile.py

diff --cc fabfile.py
Simple merge