Merge remote-tracking branch 'origin/master' into newstyles
authorOlga Brani <olgabrani@grnet.gr>
Thu, 2 Aug 2012 13:17:09 +0000 (16:17 +0300)
committerOlga Brani <olgabrani@grnet.gr>
Thu, 2 Aug 2012 13:17:09 +0000 (16:17 +0300)

Trivial merge