Merge branch 'feature-argument-abbreviations' into develop
authorStavros Sachtouris <saxtouri@admin.grnet.gr>
Thu, 30 Jan 2014 15:58:14 +0000 (17:58 +0200)
committerStavros Sachtouris <saxtouri@admin.grnet.gr>
Thu, 30 Jan 2014 15:58:14 +0000 (17:58 +0200)

Trivial merge