From: Guillaume Pellerin <yomguy@parisson.com>
Date: Wed, 2 May 2012 14:06:48 +0000 (+0200)
Subject: Merge branch 'dev' of /var/git/telemeta
X-Git-Tag: 1.4.3-2~7
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=42d8c45d680d52622d7c3c72a280b6d58601214d;p=telemeta.git

Merge branch 'dev' of /var/git/telemeta

Conflicts:
	telemeta/models/__init__.py
---

42d8c45d680d52622d7c3c72a280b6d58601214d
diff --cc telemeta/models/__init__.py
index 477ee68e,e4e118c5..f0abd449
--- a/telemeta/models/__init__.py
+++ b/telemeta/models/__init__.py
@@@ -41,4 -42,5 +41,9 @@@ from system import 
  from query import *
  from dublincore import *
  from language import *
++<<<<<<< HEAD
 +from media import *
++=======
+ from format import *
+ 
++>>>>>>> 20ef7d80a27aceda8f8266b7404d0b37a7ecf7ca