]> git.parisson.com Git - teleforma.git/commitdiff
projects / teleforma.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: de74fb2 8edcc8c)
Merge branch 'dev' of /var/git/teleforma into ae
authorGuillaume Pellerin <yomguy@parisson.com>
Mon, 5 Nov 2012 15:33:10 +0000 (16:33 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Mon, 5 Nov 2012 15:33:10 +0000 (16:33 +0100)

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.