]> git.parisson.com Git - telemeta-doc.git/commit
Merge branch 'dev'
authorGuillaume Pellerin <yomguy@parisson.com>
Sun, 29 Jun 2014 20:34:52 +0000 (22:34 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Sun, 29 Jun 2014 20:34:52 +0000 (22:34 +0200)
commit519b839fd42adf7aa8d8b5920ce69269e246bb64
tree57d37b2619a3f99b46808e4fe3920ccb581d09bb
parent96327663d2b3d74042f490f6783aac6271262bac
parent668b1a9048092ab8de2b633a600f6a95e7fa65d8
Merge branch 'dev'