Merge branch 'master' into debian-precise
authorNikos Skalkotos <skalkoto@grnet.gr>
Fri, 10 Jan 2014 11:30:43 +0000 (13:30 +0200)
committerNikos Skalkotos <skalkoto@grnet.gr>
Fri, 10 Jan 2014 11:30:43 +0000 (13:30 +0200)

Trivial merge