Merge branch 'feature-peer-improvements-rebased' into develop
authorFilippos Giannakos <philipgian@grnet.gr>
Tue, 28 Jan 2014 14:58:47 +0000 (16:58 +0200)
committerFilippos Giannakos <philipgian@grnet.gr>
Tue, 28 Jan 2014 14:58:47 +0000 (16:58 +0200)

Trivial merge