Merge branch 'master' into debian
authorNikos Skalkotos <skalkoto@grnet.gr>
Tue, 5 Nov 2013 16:51:31 +0000 (18:51 +0200)
committerNikos Skalkotos <skalkoto@grnet.gr>
Tue, 5 Nov 2013 16:51:31 +0000 (18:51 +0200)

Trivial merge