]> git.parisson.com Git - telemeta.git/commitdiff
projects / telemeta.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a261b6c 632310b)
Merge branch 'diadems' into crem2
authorGuillaume Pellerin <yomguy@parisson.com>
Fri, 28 Jun 2013 21:34:54 +0000 (23:34 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Fri, 28 Jun 2013 21:34:54 +0000 (23:34 +0200)

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