Merge branch 'feature-vlmcmultipleports' into develop
authorFilippos Giannakos <philipgian@grnet.gr>
Fri, 19 Jul 2013 14:02:12 +0000 (17:02 +0300)
committerFilippos Giannakos <philipgian@grnet.gr>
Fri, 19 Jul 2013 14:02:12 +0000 (17:02 +0300)

Trivial merge