Merge branch 'feature-history-limit' into develop
authorStavros Sachtouris <saxtouri@admin.grnet.gr>
Mon, 24 Feb 2014 11:24:27 +0000 (13:24 +0200)
committerStavros Sachtouris <saxtouri@admin.grnet.gr>
Mon, 24 Feb 2014 11:24:27 +0000 (13:24 +0200)

Trivial merge