]> git.parisson.com Git - telemeta.git/commit
Merge branch 'dev' into crem2
authorGuillaume Pellerin <yomguy@parisson.com>
Thu, 9 Jan 2014 15:15:36 +0000 (16:15 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Thu, 9 Jan 2014 15:15:36 +0000 (16:15 +0100)
commitd300ac3c92749780434bb0f33c4b73afbba3380d
tree1692d6c5dc923b4046ce26147036af560ce0a7f2
parentb806ed26d5c213e0153833d4f95f678c8efbdd8f
parent4e4780ad5c3107cc790c940d27943e2ea9c8b168
Merge branch 'dev' into crem2