tree a7003eaa3b1c0fcb50eabc7860517dad642d432d
parent 908d828d09d75b2a46152034f3f184f8c38919b5
parent ec8eae3e8376d5c5c2889b19a1a9167608bd1a12
author Mikaël Barbero <mikael.barbero@obeo.fr> 1350037474 +0200
committer Mikaël Barbero <mikael.barbero@obeo.fr> 1350037474 +0200

Merge branch 'master' into api_embellishment