Merge branch 'feature-user-commands' into develop
authorStavros Sachtouris <saxtouri@admin.grnet.gr>
Thu, 27 Jun 2013 12:57:05 +0000 (15:57 +0300)
committerStavros Sachtouris <saxtouri@admin.grnet.gr>
Thu, 27 Jun 2013 12:57:05 +0000 (15:57 +0300)

Trivial merge