]> git.parisson.com Git - telemeta.git/commit
Merge branch 'master' into dev
authoryomguy <yomguy@parisson.com>
Thu, 29 Mar 2012 12:31:29 +0000 (14:31 +0200)
committeryomguy <yomguy@parisson.com>
Thu, 29 Mar 2012 12:31:29 +0000 (14:31 +0200)
commit3130b4d46c8acb7869a7142412b6fcd5c12e78ac
tree22b2e9b3386ea6cfbd47af69066f92bddc999f08
parentb0fab0a152fc91989e1e8d3912c384675ad5fe24
parentc1e3f39e07919e51255afc84f1b8eb2e6af088cf
Merge branch 'master' into dev