Merge branch 'hotfix-0.6.1'
authorNikos Skalkotos <skalkoto@grnet.gr>
Fri, 10 Jan 2014 10:03:19 +0000 (12:03 +0200)
committerNikos Skalkotos <skalkoto@grnet.gr>
Fri, 10 Jan 2014 10:03:19 +0000 (12:03 +0200)
commit280a0e5c36ad51bcf140e5edf94b23572c82ff52
treeef1edfa7b98fff10ec941d5bccf8609915522549
parent94db968f473a997d2b29b225c08aa803910b9eab
parent0014ab89e16f56d9f3481d7ded903600a82fdb03
Merge branch 'hotfix-0.6.1'