Merge branch 'feature-synnefo-0.14' into develop
authorNikos Skalkotos <skalkoto@grnet.gr>
Thu, 20 Jun 2013 10:15:57 +0000 (13:15 +0300)
committerNikos Skalkotos <skalkoto@grnet.gr>
Thu, 20 Jun 2013 10:15:57 +0000 (13:15 +0300)

Trivial merge