Merge branch 'master' into debian-wheezy
authorNikos Skalkotos <skalkoto@grnet.gr>
Wed, 8 Jan 2014 11:40:07 +0000 (13:40 +0200)
committerNikos Skalkotos <skalkoto@grnet.gr>
Wed, 8 Jan 2014 11:40:07 +0000 (13:40 +0200)

Trivial merge