Merge branch 'develop'
authorNikos Skalkotos <skalkoto@grnet.gr>
Fri, 21 Jun 2013 11:01:35 +0000 (14:01 +0300)
committerNikos Skalkotos <skalkoto@grnet.gr>
Fri, 21 Jun 2013 11:01:35 +0000 (14:01 +0300)

Trivial merge