]> git.parisson.com Git - telemeta.git/commit
Merge branch 'dev' into crem2
authorGuillaume Pellerin <yomguy@parisson.com>
Tue, 21 May 2013 15:23:58 +0000 (17:23 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Tue, 21 May 2013 15:23:58 +0000 (17:23 +0200)
commit26023550472e807a9ed49fe684c08696aa56cf88
tree5f1fcde03945ef8ebb6ca7f7a028e7d095290708
parent2461945e88228f85ff4e42d8085988e2c43bdd4d
parentf87832dd04eb08a9bd304944b912faa13323c1a8
Merge branch 'dev' into crem2