Merge branch 'master' into packaging v0.9.1
authorKostas Papadimitriou <kpap@grnet.gr>
Wed, 20 Jun 2012 11:05:09 +0000 (14:05 +0300)
committerKostas Papadimitriou <kpap@grnet.gr>
Wed, 20 Jun 2012 11:05:09 +0000 (14:05 +0300)
commit00490ac974a9a34126b4244a24cb301b9ba23776
treefdefd410bbe9daffc720ad9d0c54168749b027bd
parent8ca2ec5f9f35948bfa16d468f097c6ed3abc14f3
parent07bdd69f08019763a33d5f0dceef7a237d09421b
Merge branch 'master' into packaging

Conflicts:
runtime.properties
runtime.properties
src/gr/grnet/pithos/web/public/index.html