]> git.parisson.com Git - telemeta.git/commit
Merge branch 'master' into dev
authoryomguy <yomguy@parisson.com>
Mon, 2 Apr 2012 15:23:27 +0000 (17:23 +0200)
committeryomguy <yomguy@parisson.com>
Mon, 2 Apr 2012 15:23:27 +0000 (17:23 +0200)
commit5018b7d46447aeedfecc4da498f04c6cf3970e53
tree553d67a3a39c96598209097681128025f1206ea4
parent18b4f7bab4f37119a815cf75763db17f20492f39
parent66fb568b059f7db41d60e05ff5e76374854007a5
Merge branch 'master' into dev