]> git.parisson.com Git - telemeta.git/commit
Merge branch 'dev' into diadems
authorGuillaume Pellerin <yomguy@parisson.com>
Mon, 3 Mar 2014 17:37:15 +0000 (18:37 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Mon, 3 Mar 2014 17:37:15 +0000 (18:37 +0100)
commit439fcae8295361303bcabbf30a2fdad2836f12b3
tree17d07636dab248a71b41cb895104b905d94c21a1
parente8af4280028778116089054cf3a12e4f0e71c2e0
parentb4cb28aeb43d1ec07a28b5708ea6cf9e2d0337c3
Merge branch 'dev' into diadems