]> git.parisson.com Git - telemeta.git/commit
Merge branch 'dev'
authoryomguy <yomguy@parisson.com>
Thu, 20 Sep 2012 14:33:45 +0000 (16:33 +0200)
committeryomguy <yomguy@parisson.com>
Thu, 20 Sep 2012 14:33:45 +0000 (16:33 +0200)
commit93b31cc20053421a91e18aa25a19f643cf48dd8b
treeb69b0ff2146f77c0a32ef4ae7bbec6db166c57b5
parent242fcb0a7a038a236a39884fc1b18e61f0d80f52
parentca021e9cd5ee81aeffb25c3de1eccd63178e772a
Merge branch 'dev'