]> git.parisson.com Git - telemeta.git/commit
Merge branch 'dev' into generic generic
authoryomguy <yomguy@parisson.com>
Mon, 19 Nov 2012 16:02:18 +0000 (17:02 +0100)
committeryomguy <yomguy@parisson.com>
Mon, 19 Nov 2012 16:02:18 +0000 (17:02 +0100)
commitce3400911bd1d7a36f642a98779fb36c9b5472e3
treedc8d9d402d89815fe39e30e7745a2077a1ebc880
parent60fdbd668bcfb63a3fe9412c034332e9dead178b
parent4d92aeb999f0b8e115cad98e3e0162a18cfdd8a4
Merge branch 'dev' into generic