Merge branch 'master' into packaging
authorKostas Papadimitriou <kpap@grnet.gr>
Mon, 20 Feb 2012 11:23:43 +0000 (13:23 +0200)
committerKostas Papadimitriou <kpap@grnet.gr>
Mon, 20 Feb 2012 11:23:43 +0000 (13:23 +0200)
commitb8f2787d222e8f17ceefce2f6d42cf803e36363d
tree5c8602c786df65729ed76007dbd1b399ee1df3f6
parent4f15c5eb21192063d1c29fe8cee1a9f01bf79475
parent5588197bc77af65676af2434b4ce4c3139633331
Merge branch 'master' into packaging