Merge branch 'feature-logging' into develop
authorStavros Sachtouris <saxtouri@admin.grnet.gr>
Thu, 18 Apr 2013 13:00:57 +0000 (16:00 +0300)
committerStavros Sachtouris <saxtouri@admin.grnet.gr>
Thu, 18 Apr 2013 13:00:57 +0000 (16:00 +0300)

Trivial merge