Merge branch 'feature-logging' into develop
authorStavros Sachtouris <saxtouri@admin.grnet.gr>
Fri, 5 Apr 2013 13:49:44 +0000 (16:49 +0300)
committerStavros Sachtouris <saxtouri@admin.grnet.gr>
Fri, 5 Apr 2013 13:49:44 +0000 (16:49 +0300)

Trivial merge