Merge branch 'packaging' into debian-0.9
authorKostas Papadimitriou <kpap@grnet.gr>
Thu, 23 Feb 2012 13:44:18 +0000 (15:44 +0200)
committerKostas Papadimitriou <kpap@grnet.gr>
Thu, 23 Feb 2012 13:44:18 +0000 (15:44 +0200)
1  2 
fabfile.py
snf-pithos-tools/setup.py

diff --cc fabfile.py
Simple merge
Simple merge