Merge branch 'feature-expand-wait-functionality' into develop
authorStavros Sachtouris <saxtouri@admin.grnet.gr>
Wed, 26 Jun 2013 14:03:09 +0000 (17:03 +0300)
committerStavros Sachtouris <saxtouri@admin.grnet.gr>
Wed, 26 Jun 2013 14:03:09 +0000 (17:03 +0300)

Trivial merge