]> git.parisson.com Git - teleforma.git/commitdiff
projects / teleforma.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 12d85a6 a1cdae7)
Merge branch 'dev'
authoryomguy <yomguy@parisson.com>
Tue, 10 Jul 2012 13:21:28 +0000 (15:21 +0200)
committeryomguy <yomguy@parisson.com>
Tue, 10 Jul 2012 13:21:28 +0000 (15:21 +0200)

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