]> git.parisson.com Git - telemeta.git/commit
Merge branch 'master' into dev
authoryomguy <yomguy@parisson.com>
Tue, 27 Mar 2012 15:45:13 +0000 (17:45 +0200)
committeryomguy <yomguy@parisson.com>
Tue, 27 Mar 2012 15:45:13 +0000 (17:45 +0200)
commit3a511d6495b133616017114b75b07ee53ba63c68
tree8d99789a7d70b72a8a14ac2a8341ad406d49a144
parentaaba0db94d6d7ed34ab23317969ff6dc7788c8a2
parentc02171b1049965e9266ac21b5c0d5c205a225fb2
Merge branch 'master' into dev