]> git.parisson.com Git - telemeta.git/commit
Merge branch 'master' into develop
authoryomguy <yomguy@parisson.com>
Wed, 2 May 2012 14:31:23 +0000 (16:31 +0200)
committeryomguy <yomguy@parisson.com>
Wed, 2 May 2012 14:31:23 +0000 (16:31 +0200)
commitd24c827d706bd02f5a36eb41d90a82fb8c9e3d63
treed387bc3b8026fcd6c22eec828b10ef8c1fdf704f
parentd68b189a8d106b07ffa808899e9aff1ba4268fc9
parent03ca02316c633f89a5c1fcb7b8e1af2a6397ee0d
Merge branch 'master' into develop