]> git.parisson.com Git - teleforma.git/commit
Merge branch 'dev' of /var/git/teleforma into ae
authorGuillaume Pellerin <yomguy@parisson.com>
Mon, 5 Nov 2012 15:38:39 +0000 (16:38 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Mon, 5 Nov 2012 15:38:39 +0000 (16:38 +0100)
commit48978b67d81f5c022a6a90a4c85aaf98caabaf64
tree4357795d0996fbd2c0287fd86eee8b4ecf3c968f
parent0af51443a11e44a8f0d692fc772158d32b1aa613
parent54c2ce12db7475fc75dcc4c5c978c1e186cb4cf2
Merge branch 'dev' of /var/git/teleforma into ae