Merge branch 'develop' into release-0.16
authorKostas Papadimitriou <kpap@grnet.gr>
Tue, 9 Sep 2014 12:41:20 +0000 (15:41 +0300)
committerKostas Papadimitriou <kpap@grnet.gr>
Tue, 9 Sep 2014 12:41:20 +0000 (15:41 +0300)
commit9b7f79a5830bd5021381be78fb5ca80a59f891b2
tree627151fd15837915558410aef1a6f4a4c955afd0
parent0fbbd4eba2cfe521521320a558b7f5ffc8016240
parentea1faa06738b14279ac6a6e854377c0874ab30d0
Merge branch 'develop' into release-0.16

Conflicts:
version