Merge remote-tracking branch 'upstream/master'

author tommy tomson <thomas.bierey@gmx.de>

Fri, 2 Mar 2012 03:58:37 +0000 (04:58 +0100)

committer tommy tomson <thomas.bierey@gmx.de>

Fri, 2 Mar 2012 03:58:37 +0000 (04:58 +0100)
author tommy tomson <thomas.bierey@gmx.de>
Fri, 2 Mar 2012 03:58:37 +0000 (04:58 +0100)
committer tommy tomson <thomas.bierey@gmx.de>
Fri, 2 Mar 2012 03:58:37 +0000 (04:58 +0100)
diff --git a/view/theme/diabook b/view/theme/diabook

new file mode 160000 (submodule)

index 0000000..e29c43c
--- /dev/null
+++ b/view/theme/diabook
@@ -0,0 +1 @@
+Subproject commit e29c43c4e78e42f448cbd84dc51a3a346bdab01f
author	tommy tomson <thomas.bierey@gmx.de>
	Fri, 2 Mar 2012 03:58:37 +0000 (04:58 +0100)
committer	tommy tomson <thomas.bierey@gmx.de>
	Fri, 2 Mar 2012 03:58:37 +0000 (04:58 +0100)