Merge branch 'master' into debian
authorDimitris Aragiorgis <dimara@grnet.gr>
Fri, 24 May 2013 15:05:12 +0000 (18:05 +0300)
committerDimitris Aragiorgis <dimara@grnet.gr>
Fri, 24 May 2013 15:05:12 +0000 (18:05 +0300)

Trivial merge