From: Stavros Sachtouris <saxtouri@admin.grnet.gr>
Date: Thu, 3 Jan 2013 12:31:51 +0000 (+0200)
Subject: Merge branch 'feature-output' into develop
X-Git-Tag: v0.6.3~10^2~9
X-Git-Url: https://code.grnet.gr/git/kamaki/commitdiff_plain/ed02014e87c520e1156cca4ab3f51095bb4bfb28

Merge branch 'feature-output' into develop
---

ed02014e87c520e1156cca4ab3f51095bb4bfb28