Merge branch 'master' into debian-precise
authorNikos Skalkotos <skalkoto@grnet.gr>
Wed, 8 Jan 2014 13:59:24 +0000 (15:59 +0200)
committerNikos Skalkotos <skalkoto@grnet.gr>
Wed, 8 Jan 2014 13:59:24 +0000 (15:59 +0200)

Trivial merge