]> git.parisson.com Git - telecaster-client.git/commit
Merge branch 'dev'
authorGuillaume Pellerin <yomguy@parisson.com>
Wed, 15 Apr 2015 09:18:30 +0000 (11:18 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Wed, 15 Apr 2015 09:18:30 +0000 (11:18 +0200)
commitba4ab8b9e3296114705075a459f0a8efe4b811b3
tree48218e4e78ce40df3183a045677871e06a9fa792
parenta06f2eb23e9befec2d3d1dca78c4c276d45b2414
parent3052fdd5baab95316205e29897a9d47ccc627e1d
Merge branch 'dev'

Conflicts:
telecaster/tools/status.py