Merge branch 'features/history' into develop
authorStavros Sachtouris <saxtouri@admin.grnet.gr>
Wed, 12 Dec 2012 17:26:30 +0000 (19:26 +0200)
committerStavros Sachtouris <saxtouri@admin.grnet.gr>
Wed, 12 Dec 2012 17:26:30 +0000 (19:26 +0200)

Trivial merge