]> git.parisson.com Git - telemeta.git/commit
Merge branch 'dev' into crem2
authorGuillaume Pellerin <yomguy@parisson.com>
Wed, 8 Jan 2014 22:45:31 +0000 (23:45 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Wed, 8 Jan 2014 22:45:31 +0000 (23:45 +0100)
commitd0d2f282da8c3ab9b81a28ead3e4286d794eef76
tree26ac45806ca75ae43525ac071138aeef8cbc7a28
parent4d3604855547aef44e277c4c2403e4739215bce1
parent17fd49313f7fb96e24e5e9f1c0d9e2a80033bc17
Merge branch 'dev' into crem2