Merge branch 'hotfix-0.5.1' into debian-wheezy
authorNikos Skalkotos <skalkoto@grnet.gr>
Fri, 23 Aug 2013 14:00:18 +0000 (17:00 +0300)
committerNikos Skalkotos <skalkoto@grnet.gr>
Fri, 23 Aug 2013 14:00:18 +0000 (17:00 +0300)
commiteee82c44247f33561ff760d5505a8c8f86cab678
treee25d8d6b0129c395e98b6d0cdc86221e8fb86940
parent15bc03a8268f5feb7a6e696dbb3bc6da90e1cd5b
parentcce32feab871a813083d2e7abc510894943ee890
Merge branch 'hotfix-0.5.1' into debian-wheezy