Merge branch 'packaging' into debian-0.8
authorKostas Papadimitriou <kpap@grnet.gr>
Mon, 23 Jan 2012 18:31:34 +0000 (20:31 +0200)
committerKostas Papadimitriou <kpap@grnet.gr>
Mon, 23 Jan 2012 18:31:34 +0000 (20:31 +0200)
1  2 
fabfile.py

diff --cc fabfile.py
Simple merge