Merge branch 'develop'
authorNikos Skalkotos <skalkoto@grnet.gr>
Wed, 8 Jan 2014 10:33:08 +0000 (12:33 +0200)
committerNikos Skalkotos <skalkoto@grnet.gr>
Wed, 8 Jan 2014 10:33:08 +0000 (12:33 +0200)

Trivial merge