Merge branch 'packaging' into debian-0.8
authorKostas Papadimitriou <kpap@grnet.gr>
Fri, 27 Jan 2012 10:33:18 +0000 (12:33 +0200)
committerKostas Papadimitriou <kpap@grnet.gr>
Fri, 27 Jan 2012 10:33:18 +0000 (12:33 +0200)
commit0cd72d6565b381b285f57b223aaeaf170af55b91
tree146be38745763e315d6ff96763726f9f80730b94
parent1a2928aacf7ae4e9aa2eef70fbed570cee7bd70e
parent858e0ab927811235f74962d9f6c55d9317893409
Merge branch 'packaging' into debian-0.8

Conflicts:
fabfile.py
fabfile.py