]> git.parisson.com Git - teleforma.git/commit
Merge branch 'prodev' of /var/git/teleforma into prodev
authorGuillaume Pellerin <yomguy@parisson.com>
Fri, 6 Dec 2013 20:48:22 +0000 (21:48 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Fri, 6 Dec 2013 20:48:22 +0000 (21:48 +0100)
commitdf696f34c49cb34f68159ef213e389d94c651c9a
tree7105e888ce0f65472cf6c8430b9ec56a9aec286d
parentd1e3cd5123fa6ecdca1559c0ded471e983ad8797
parentebe3365d277c3f48a245f91ce74465a5da8d8529
Merge branch 'prodev' of /var/git/teleforma into prodev