Merge branch 'features/history' into develop
authorStavros Sachtouris <saxtouri@admin.grnet.gr>
Fri, 14 Dec 2012 10:35:56 +0000 (12:35 +0200)
committerStavros Sachtouris <saxtouri@admin.grnet.gr>
Fri, 14 Dec 2012 10:35:56 +0000 (12:35 +0200)

Trivial merge