Merge branch 'release-0.2'
authorFilippos Giannakos <philipgian@grnet.gr>
Thu, 30 May 2013 09:18:40 +0000 (12:18 +0300)
committerFilippos Giannakos <philipgian@grnet.gr>
Thu, 30 May 2013 09:18:40 +0000 (12:18 +0300)

Trivial merge