Merge "Add framework for presentations"
authorMorgan Richomme <morgan.richomme@orange.com>
Wed, 1 Jun 2016 14:42:03 +0000 (14:42 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Wed, 1 Jun 2016 14:42:03 +0000 (14:42 +0000)

Trivial merge