Merge branch 'amorale/OP-1857_ppm_on_flexi_cc' into rel-15.02.02
commit842330922fc4a7ab13cd4e55a7e2897efede3552
authorLaurent Lalanne <f5soh@free.fr>
Sun, 3 May 2015 11:22:47 +0000 (3 13:22 +0200)
committerLaurent Lalanne <f5soh@free.fr>
Sun, 3 May 2015 11:22:47 +0000 (3 13:22 +0200)
treed3937abc1fc239d7a74818a21795b9a8649111b5
parentc1566fa7d2d0f47b1b5c8c6c24fd4740ff59f3f0
parent6d9bb8a287ae90a55a98fd101161d44eac52fc7b
Merge branch 'amorale/OP-1857_ppm_on_flexi_cc' into rel-15.02.02