]> git.parisson.com Git - teleforma.git/commit
Merge branch 'dev' of git+ssh://vcs.parisson.com/var/git/teleforma into dev
authoryomguy <yomguy@parisson.com>
Thu, 19 Jul 2012 13:16:39 +0000 (15:16 +0200)
committeryomguy <yomguy@parisson.com>
Thu, 19 Jul 2012 13:16:39 +0000 (15:16 +0200)
commitbbd9e85ce3084c3895b300a4e1437de758cb292b
treee6e8677b34bb41dcefca5ee46057a22820e79053
parentba1345aa6074e963a3111832f241fd48f0833588
parent278a443740c34a129f84eb61a443b547a678cb48
Merge branch 'dev' of git+ssh://vcs.parisson.com/var/git/teleforma into dev

Conflicts:
teleforma/management/commands/teleforma-import-conferences.py
teleforma/management/commands/teleforma-import-conferences.py