]> git.parisson.com Git - telemeta.git/commit
Merge branch 'dev' into crem2
authorGuillaume Pellerin <yomguy@parisson.com>
Thu, 2 Jan 2014 09:44:18 +0000 (10:44 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Thu, 2 Jan 2014 09:44:18 +0000 (10:44 +0100)
commit80aedd4e784df639928f6b8afed2673bfcfecb93
tree4a0084022a6a1de44e32aee1e0a56903af545fa6
parentdb341e5de2769fa4c66584b29d9e1792bef0b261
parentea8b2566f5cf8702f92b1e7f241c7b111fad0ce1
Merge branch 'dev' into crem2