]> git.parisson.com Git - teleforma.git/commit
Merge branch 'dev'
authoryomguy <yomguy@parisson.com>
Sun, 5 Aug 2012 16:06:24 +0000 (18:06 +0200)
committeryomguy <yomguy@parisson.com>
Sun, 5 Aug 2012 16:06:24 +0000 (18:06 +0200)
commit301587f9ec9136aa7b657ef3c724654b301f1403
tree50f9481865ef6556d6603d0ebb482d618967690e
parentd5771e0e62a1f21c8da0d11fa43e7365e9a12403
parent04c9d4dbe719cc59e3e5ef363802b9b368f4234a
Merge branch 'dev'