]> git.parisson.com Git - teleforma.git/commit
Merge branch 'master' of git+ssh://angus.parisson.com/var/git/teleforma
authoryomguy <yomguy@parisson.com>
Wed, 18 Apr 2012 09:33:04 +0000 (11:33 +0200)
committeryomguy <yomguy@parisson.com>
Wed, 18 Apr 2012 09:33:04 +0000 (11:33 +0200)
commita2ac436f51c8f8aaa04e065d90c6d7ebfaf21466
treed24e3d1435114d6608205dbbd1f1df50756ed6d1
parentb8cba1a9067a600b014c4d020413256f57360691
parent6bda594784391a205ba3dd1b637c7d120f18ceb0
Merge branch 'master' of git+ssh://angus.parisson.com/var/git/teleforma

Conflicts:
teleforma/views.py
teleforma/models.py
teleforma/views.py