Merge branch 'master' into debian-squeeze
authorChristos Stavrakakis <cstavr@grnet.gr>
Fri, 30 Aug 2013 14:39:59 +0000 (17:39 +0300)
committerChristos Stavrakakis <cstavr@grnet.gr>
Fri, 30 Aug 2013 14:39:59 +0000 (17:39 +0300)

Trivial merge