Merge branch 'feature-sosd-fix' into develop
authorAlex Pyrgiotis <apyrgio@grnet.gr>
Wed, 27 Nov 2013 13:23:45 +0000 (15:23 +0200)
committerAlex Pyrgiotis <apyrgio@grnet.gr>
Wed, 27 Nov 2013 13:25:17 +0000 (15:25 +0200)

Trivial merge