]> git.parisson.com Git - telemeta-doc.git/commit
Merge branch 'dev'
authorGuillaume Pellerin <yomguy@parisson.com>
Sun, 29 Jun 2014 20:33:27 +0000 (22:33 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Sun, 29 Jun 2014 20:33:27 +0000 (22:33 +0200)
commit96327663d2b3d74042f490f6783aac6271262bac
tree1ac94e2ccdad17b33f4fbe93691895e4b8971a1b
parentb25c19c3687f459a673f19cdcf8411bc64c8334d
parent1565b11c0ca150c330f366f431044238cbe48b90
Merge branch 'dev'