]> git.parisson.com Git - teleforma.git/commit
Merge branch 'prodev' into pro
authorGuillaume Pellerin <yomguy@parisson.com>
Tue, 10 Jun 2014 11:52:56 +0000 (13:52 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Tue, 10 Jun 2014 11:52:56 +0000 (13:52 +0200)
commitdb5f37b2c0fee06bd5067ba4746276a7964e8312
tree5f64bf29b105251fc8c500fc992469650e35dd4c
parent1ec95b72c00cedf69e9f8d971906825e85d1a2a3
parentf3b70b85d85421471ea441e5e31ba6444c8e18d1
Merge branch 'prodev' into pro