Revision df30fbe28eb83bae4e76b229979c90062a291909

Committed on 29/01/2016 6:54 am by Bertrand Dunogier <bd@ez.no> [GitHub Diff]

Merge branch 'release-1.1.0'

Conflicts:
composer.json