Merge branch 'develop'
authorKostas Papadimitriou <kpap@grnet.gr>
Tue, 12 Feb 2013 15:19:33 +0000 (17:19 +0200)
committerKostas Papadimitriou <kpap@grnet.gr>
Tue, 12 Feb 2013 15:19:33 +0000 (17:19 +0200)
commit701933be914636352cdf05b6970d9ef047a0a58d
tree89f303942004fc3d09edd754ee9bda46ef3e9217
parent931781da00a784ce45890b9fb0ad4f515e3e47dc
parent00ced2a81f2f5b8e8b80bbbcf3071fb86b553bfe
Merge branch 'develop'

Conflicts:
version
version