Merge branch 'master' of ssh://git.domainepublic.net/django-panik-emissions

diff --cc panikdb/emissions/models.py
index a7ce662262b3440af3c3420ae7ed9dc4870a79be,318304c5c5da7540d6c10aba7e29aff182d610b5..5c374c10941f83c1f82b75fdca80480ad7de830b
--- 1/panikdb/emissions/models.py
--- 2/panikdb/emissions/models.py
+++ b/panikdb/emissions/models.py
@@@ -25,10 -25,11 +25,12 @@@ class Emission(models.Model)
      description = RichTextField(null=True, blank=True)
      text = RichTextField(null=True)
      archived = models.BooleanField(default=False)
 -
 +    #contact = models.EmailField() 
      categories = models.ManyToManyField(Category)
 +    #langs? (HOW? Must be an array of multiples choices!) 
  
+     duration = 60
+ 
      def get_absolute_url(self):
          return reverse('emission-view', kwargs={'slug': str(self.slug)})