]> git.parisson.com Git - telemeta.git/commitdiff
projects / telemeta.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 155611d bd6dbb0)
Merge branch 'crem2' into diadems
authorGuillaume Pellerin <yomguy@parisson.com>
Thu, 13 Jun 2013 11:47:37 +0000 (13:47 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Thu, 13 Jun 2013 11:47:37 +0000 (13:47 +0200)

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