]> git.parisson.com Git - telemeta.git/commit
Merge branch 'dev' into crem2
authorGuillaume Pellerin <yomguy@parisson.com>
Tue, 16 Dec 2014 15:33:58 +0000 (16:33 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Tue, 16 Dec 2014 15:33:58 +0000 (16:33 +0100)
commitd73be29186b07de31b7af38830c13e58fa7b5d4d
treed36ac01f0ed862b03cdc93f7624ea2cc68587908
parent067cd7267a18bd21342f64733f7f019062cdda9f
parenta8a0ae0cc7eb2842dd5eacac11cc4f6dfb8cdb5d
Merge branch 'dev' into crem2