Merge branch 'master' into debian-wheezy
authorNikos Skalkotos <skalkoto@grnet.gr>
Thu, 10 Oct 2013 09:47:01 +0000 (12:47 +0300)
committerNikos Skalkotos <skalkoto@grnet.gr>
Thu, 10 Oct 2013 09:47:01 +0000 (12:47 +0300)

Trivial merge