Merge branch 'release-0.15' into develop
authorKostas Papadimitriou <kpap@grnet.gr>
Fri, 7 Feb 2014 14:21:57 +0000 (16:21 +0200)
committerKostas Papadimitriou <kpap@grnet.gr>
Fri, 7 Feb 2014 14:21:57 +0000 (16:21 +0200)
commitc3b0657733d844776807c3047954953fd6272e48
tree429bf20acd8202bc733af5599b1319270cb5c990
parente15a05c387f0c6ebb5df3be93893533a92ef675a
parent3d33fa7622883306f2815b36c16ea0c6c2552447
Merge branch 'release-0.15' into develop

Conflicts:
version