From: Guillaume Pellerin <yomguy@parisson.com>
Date: Fri, 12 Jul 2013 01:08:23 +0000 (+0200)
Subject: Merge branch 'dev' of git+ssh://vcs.parisson.com/var/git/telecaster-client into dev
X-Git-Tag: 0.9~29
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=7db758986600d75ebf81373aefd8855f59e50030;p=telecaster-client.git

Merge branch 'dev' of git+ssh://vcs.parisson.com/var/git/telecaster-client into dev
---

7db758986600d75ebf81373aefd8855f59e50030
diff --cc telecaster/models.py
index 0941fa5,2aeb5c3..5ce79d3
--- a/telecaster/models.py
+++ b/telecaster/models.py
@@@ -53,9 -51,10 +51,11 @@@ from django.utils.translation import ug
  
  from south.modelsinspector import add_introspection_rules
  
 -from teleforma.models import *
 +from teleforma.models import Conference
 +
  
+ from tools import *
+ 
  app_label = 'telecaster'
  spacer = '_-_'