Merge branch 'feature-testingrados' into develop
authorFilippos Giannakos <philipgian@grnet.gr>
Thu, 1 Aug 2013 10:51:16 +0000 (13:51 +0300)
committerFilippos Giannakos <philipgian@grnet.gr>
Thu, 1 Aug 2013 10:51:16 +0000 (13:51 +0300)

Trivial merge