From: Stavros Sachtouris <saxtouri@admin.grnet.gr>
Date: Fri, 14 Dec 2012 10:35:56 +0000 (+0200)
Subject: Merge branch 'features/history' into develop
X-Git-Tag: v0.6.3~3^2~12
X-Git-Url: https://code.grnet.gr/git/kamaki/commitdiff_plain/67fc6c83625351968b0e48b68d3dd17191664832

Merge branch 'features/history' into develop
---

67fc6c83625351968b0e48b68d3dd17191664832