]> git.parisson.com Git - telemeta.git/commit
Merge branch 'dev'
authoryomguy <yomguy@parisson.com>
Mon, 17 Sep 2012 16:47:53 +0000 (18:47 +0200)
committeryomguy <yomguy@parisson.com>
Mon, 17 Sep 2012 16:47:53 +0000 (18:47 +0200)
commit242fcb0a7a038a236a39884fc1b18e61f0d80f52
tree37ec5e085f4c6d44146e58ca5ca705d9a568e866
parentf6666ad5c933d168bb1d7d90de6c016b475f9d8a
parentd0a3dcd423fd9b9677eb5a7840e95554a47c8051
Merge branch 'dev'