[debian-edu-commits] [SCM] Debian package debian-edu-doc branch, wheezy, updated. 1.4_20120925_6.0.6-52-g82f3e04

[Wolfgang Schweer]

The following commit has been merged in the wheezy branch:
commit cb1fbf00a2ce01bc3fd5c869f685008cb8ed45a0
Merge: 4b3c686464deb0cb87afda2d829b1c591eabf58d 5234c2269af066c98463eec90dd67502aec59e47
Author: Wolfgang Schweer <w.schweer at gmx.de>
Date:   Thu Feb 14 21:39:02 2013 +0100

    Merge branch 'wheezy' of ssh+git://git.debian.org/git/debian-edu/debian-edu-doc into wheezy
    
    Conflicts:
    	documentation/debian-edu-wheezy/debian-edu-wheezy-manual.de.po

diff --combined documentation/debian-edu-wheezy/debian-edu-wheezy-manual.de.po
index 9adbd18,31ad918..0000000
deleted file mode 100644,100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.de.po
+++ /dev/null

-- 
Debian package debian-edu-doc