Merge branch 'master' into packaging v0.8.7
authorKostas Papadimitriou <kpap@grnet.gr>
Thu, 19 Apr 2012 09:17:52 +0000 (12:17 +0300)
committerKostas Papadimitriou <kpap@grnet.gr>
Thu, 19 Apr 2012 09:17:52 +0000 (12:17 +0300)
commit0c0578bae62f8d6c16bb3e673afb9423390c7cec
tree07693bc81f23598c1c9a5da16045e4abf08cb066
parent0f36748877f9cadd8e62eddae0e6ff3b0fa8721c
parent2d0e60eeb08d61661dbd704faacf1bbf6c637cc2
Merge branch 'master' into packaging