]> git.parisson.com Git - teleforma.git/commit
Merge branch 'dev' of git+ssh://vcs.parisson.com/var/git/teleforma into dev
authorGuillaume Pellerin <yomguy@parisson.com>
Sat, 28 Jul 2012 22:21:15 +0000 (00:21 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Sat, 28 Jul 2012 22:21:15 +0000 (00:21 +0200)
commit149cd6789b7ea4e14fd003bd0d1bcb24992e039d
tree38766a3ff7c57006a28280336e03db744dfd0197
parentd225ed5c014a9157fb8eaeda56d7bc3bd1272cc2
parent1e05a711e8de0e07a72e7c0e6cf1caef581a1709
Merge branch 'dev' of git+ssh://vcs.parisson.com/var/git/teleforma into dev