Merge branch 'hotfix-0.14.2'
authorKostas Papadimitriou <kpap@grnet.gr>
Thu, 25 Jul 2013 13:03:29 +0000 (16:03 +0300)
committerKostas Papadimitriou <kpap@grnet.gr>
Thu, 25 Jul 2013 13:03:29 +0000 (16:03 +0300)
commit974fe113f7d795038c5346d07ceebe43e75e899f
treeac3f38a13bb97461cccc7e7788ed2a69e646ba36
parentdb63b74102fc77c0888b21db5b1f6bfcafc5305d
parentff76cf7a59a2d98d761cdceaee5e0a0c4ffbf44a
Merge branch 'hotfix-0.14.2'

Conflicts:
version