Merge branch 'feature-flavor-filters' into develop
authorStavros Sachtouris <saxtouri@admin.grnet.gr>
Mon, 26 Aug 2013 13:35:04 +0000 (16:35 +0300)
committerStavros Sachtouris <saxtouri@admin.grnet.gr>
Mon, 26 Aug 2013 13:35:04 +0000 (16:35 +0300)

Trivial merge