]> git.parisson.com Git - teleforma.git/commit
Merge branch 'prodev' into pro
authorGuillaume Pellerin <yomguy@parisson.com>
Wed, 11 Jun 2014 12:20:18 +0000 (14:20 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Wed, 11 Jun 2014 12:20:18 +0000 (14:20 +0200)
commitff58db2b6fe1be91d72dbc1b4a536333d01fab8c
tree175d13d6bb3752e7a2b2b76ecb60c4bd19933f2a
parent413b0751f8aa37c27d0d2c0d99ec0a57269f6079
parentfc0a508a2d3f02b8f32993b297fbdec2b6c3373e
Merge branch 'prodev' into pro