Merge branch 'master' into develop
authorNikos Skalkotos <skalkoto@grnet.gr>
Thu, 12 Dec 2013 14:52:01 +0000 (16:52 +0200)
committerNikos Skalkotos <skalkoto@grnet.gr>
Thu, 12 Dec 2013 14:52:01 +0000 (16:52 +0200)

Trivial merge