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

Conflicts:
	telemeta/models/__init__.py

diff --cc telemeta/models/__init__.py
index 477ee68eaa7913acde5c116406d4b9bf411a02fb,e4e118c5723259d016421d9dc396a46639eab7fa..f0abd449cd0da0b5a45069d04ab151e8114ead85
--- 1/telemeta/models/__init__.py
--- 2/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

diff --cc telemeta/views/base.py
Simple merge