]> git.parisson.com Git - telemeta.git/commit
Merge branch 'master' of git+ssh://vcs.parisson.com/var/git/telemeta
authoryomguy <yomguy@parisson.com>
Mon, 6 Feb 2012 22:38:53 +0000 (23:38 +0100)
committeryomguy <yomguy@parisson.com>
Mon, 6 Feb 2012 22:38:53 +0000 (23:38 +0100)
commit746563a2dad78d4e7fa7ac9c3877f54c71fe9cc4
tree254f2299684a43e4de6752c1d627d84e5f9b7c80
parent15cc3ef202952b26500edad4b2230dfef7ed3175
parente51c2f2b09297c47078fe2abc1be03a49dda586c
Merge branch 'master' of git+ssh://vcs.parisson.com/var/git/telemeta

Conflicts:
telemeta/templates/telemeta/resource_add.html