From: Kristian Kræmmer Nielsen <jkkn@jkkn.dk>
Date: Thu, 20 Dec 2007 00:37:37 +0000 (+0100)
Subject: Merge branch 'master' of ssh://jkkn@jkkn.dk/home/git/tv2developer
X-Git-Url: https://git.jkkn.net/?a=commitdiff_plain;h=6470dd96130247345fd7c2d7d0c2b35b306982eb;p=tv2developer

Merge branch 'master' of ssh://jkkn@jkkn.dk/home/git/tv2developer

Conflicts:

	content/tv2developer.js
	version
---

6470dd96130247345fd7c2d7d0c2b35b306982eb
diff --cc version
index a3df0a6,e7c7d3c..8adc70f
--- a/version
+++ b/version
@@@ -1,1 -1,1 +1,1 @@@
- 0.8.0
 -0.7.8
++0.8.0