]> git.parisson.com Git - teleforma.git/commit
Merge branch 'dev' of /var/git/teleforma into ae
authorGuillaume Pellerin <yomguy@parisson.com>
Wed, 7 Nov 2012 10:52:00 +0000 (11:52 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Wed, 7 Nov 2012 10:52:00 +0000 (11:52 +0100)
commitc1cfc41871361e39d8c912b71acbf170cb3c4f14
treea8eb9fa305a08b83933f38b23205a98db0b0c09b
parent5f3a84c27d40836bacb5b10e464554e61859f321
parent21db4ba1befb585479ecb2aeef0cf15a3eb08f85
Merge branch 'dev' of /var/git/teleforma into ae