Merge branch 'master' into debian-wheezy
authorNikos Skalkotos <skalkoto@grnet.gr>
Thu, 27 Jun 2013 11:42:29 +0000 (14:42 +0300)
committerNikos Skalkotos <skalkoto@grnet.gr>
Thu, 27 Jun 2013 11:42:29 +0000 (14:42 +0300)

Trivial merge