]> git.parisson.com Git - telemeta.git/commit
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)
commit6d2ada5ca01c8e611f3aa98eee46c137df84f8dd
treec55999e175f7b564b8c93e308dc967586b85b81d
parenta261b6c2e670bd6ce75ca29c82ed3bd5e029df62
parent632310bc0a058baf2e2dfef0843b01499c0a34a1
Merge branch 'diadems' into crem2