Merge branch 'feature-logging' into develop
authorStavros Sachtouris <saxtouri@admin.grnet.gr>
Fri, 10 May 2013 14:55:27 +0000 (17:55 +0300)
committerStavros Sachtouris <saxtouri@admin.grnet.gr>
Fri, 10 May 2013 14:55:27 +0000 (17:55 +0300)

Trivial merge